diff --git a/SDK/include/NDK/Algorithm.hpp b/SDK/include/NDK/Algorithm.hpp
index c98e63c6c..7c8de5a31 100644
--- a/SDK/include/NDK/Algorithm.hpp
+++ b/SDK/include/NDK/Algorithm.hpp
@@ -11,11 +11,16 @@
 
 namespace Ndk
 {
+	class BaseComponent;
+	class BaseSystem;
+
 	template<unsigned int N> ComponentId BuildComponentId(const char (&name)[N]);
 	template<typename ComponentType> constexpr ComponentIndex GetComponentIndex();
 	template<typename SystemType> constexpr SystemIndex GetSystemIndex();
 	template<typename ComponentType, unsigned int N> ComponentIndex InitializeComponent(const char (&name)[N]);
 	template<typename SystemType> SystemIndex InitializeSystem();
+	template<typename ComponentType> bool IsComponent(BaseComponent& component);
+	template<typename SystemType> bool IsSystem(BaseSystem& system);
 }
 
 #include <Ndk/Algorithm.inl>
diff --git a/SDK/include/NDK/Algorithm.inl b/SDK/include/NDK/Algorithm.inl
index 2f2586868..8392e0ed6 100644
--- a/SDK/include/NDK/Algorithm.inl
+++ b/SDK/include/NDK/Algorithm.inl
@@ -3,6 +3,8 @@
 // For conditions of distribution and use, see copyright notice in Prerequesites.hpp
 
 #include <Nazara/Core/Endianness.hpp>
+#include <Ndk/BaseComponent.hpp>
+#include <Ndk/BaseSystem.hpp>
 
 namespace Ndk
 {
@@ -44,4 +46,16 @@ namespace Ndk
 		SystemType::systemIndex = SystemType::RegisterSystem();
 		return SystemType::systemIndex;
 	}
+
+	template<typename ComponentType>
+	bool IsComponent(BaseComponent& component)
+	{
+		return component.GetIndex() == GetComponentIndex<ComponentType>();
+	}
+
+	template<typename SystemType>
+	bool IsSystem(BaseSystem& system)
+	{
+		return system.GetIndex() == GetSystemIndex<SystemType>();
+	}
 }