diff --git a/SDK/include/NDK/Components/ParticleGroupComponent.hpp b/SDK/include/NDK/Components/ParticleGroupComponent.hpp
index 638f877d3..0dce5dd23 100644
--- a/SDK/include/NDK/Components/ParticleGroupComponent.hpp
+++ b/SDK/include/NDK/Components/ParticleGroupComponent.hpp
@@ -25,6 +25,12 @@ namespace Ndk
 			ParticleGroupComponent(const ParticleGroupComponent&) = default;
 			~ParticleGroupComponent() = default;
 
+			void AddEmitter(Entity* emitter);
+			using ParticleGroup::AddEmitter;
+
+			void RemoveEmitter(Entity* emitter);
+			using ParticleGroup::RemoveEmitter;
+
 			static ComponentIndex componentIndex;
 	};
 }
diff --git a/SDK/include/NDK/Components/ParticleGroupComponent.inl b/SDK/include/NDK/Components/ParticleGroupComponent.inl
index 7aefdad56..c6e0cba7b 100644
--- a/SDK/include/NDK/Components/ParticleGroupComponent.inl
+++ b/SDK/include/NDK/Components/ParticleGroupComponent.inl
@@ -1,8 +1,11 @@
-#include "ParticleGroupComponent.hpp"
 // Copyright (C) 2015 Jérôme Leclercq
 // This file is part of the "Nazara Development Kit"
 // For conditions of distribution and use, see copyright notice in Prerequesites.hpp
 
+#include <NDK/Components/ParticleGroupComponent.hpp>
+#include <NDK/Components/ParticleEmitterComponent.hpp>
+#include <Nazara/Core/Error.hpp>
+
 namespace Ndk
 {
 	inline ParticleGroupComponent::ParticleGroupComponent(unsigned int maxParticleCount, Nz::ParticleLayout layout) :
@@ -14,4 +17,22 @@ namespace Ndk
 	ParticleGroup(maxParticleCount, std::move(declaration))
 	{
 	}
+
+	inline void ParticleGroupComponent::AddEmitter(Entity* emitter)
+	{
+		NazaraAssert(emitter && emitter->IsValid(), "Invalid entity");
+		NazaraAssert(emitter->HasComponent<ParticleEmitterComponent>(), "Entity must have a NodeComponent");
+
+		auto& emitterComponent = emitter->GetComponent<ParticleEmitterComponent>();
+		ParticleGroup::AddEmitter(&emitterComponent);
+	}
+
+	inline void ParticleGroupComponent::RemoveEmitter(Entity* emitter)
+	{
+		NazaraAssert(emitter && emitter->IsValid(), "Invalid entity");
+		NazaraAssert(emitter->HasComponent<ParticleEmitterComponent>(), "Entity must have a NodeComponent");
+
+		auto& emitterComponent = emitter->GetComponent<ParticleEmitterComponent>();
+		ParticleGroup::RemoveEmitter(&emitterComponent);
+	}
 }