diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/context/AgentContext.kt b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/context/AgentContext.kt
index 45ffec1f..7ef1dfe3 100644
--- a/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/context/AgentContext.kt
+++ b/Partner-Framework/src/main/java/work/slhaf/partner/api/agent/factory/context/AgentContext.kt
@@ -16,9 +16,9 @@ object AgentContext {
         get() = _modules
 
     private val _capabilities =
-        mutableMapOf<String, MutableSet<CapabilityImplementation>>()
+        mutableMapOf<String, CapabilityImplementation>()
 
-    val capabilities: Map<String, Set<CapabilityImplementation>>
+    val capabilities: Map<String, CapabilityImplementation>
         get() = _capabilities
 
     private val _additionalComponents = mutableSetOf<Any>()
@@ -36,9 +36,8 @@ object AgentContext {
     }
 
     fun addCapability(capability: String, instance: Any, methods: Map<String, Method>) {
-        val capabilityImpls = _capabilities.computeIfAbsent(capability) { mutableSetOf() }
         val newImpl = CapabilityImplementation(instance.javaClass, instance, methods)
-        capabilityImpls.add(newImpl)
+        _capabilities[capability] = newImpl
     }
 
     fun addAdditionalComponent(instance: Any): Boolean {