diff --git a/pages/PROJECTS___MOSAICO___WP2.md b/pages/PROJECTS___MOSAICO___WP2.md
index 68426412..5d769613 100644
--- a/pages/PROJECTS___MOSAICO___WP2.md
+++ b/pages/PROJECTS___MOSAICO___WP2.md
@@ -6,72 +6,69 @@
 	  title MOSAICO Agent Metadata Model
 	  
 	  class Agent {
-	    +String id
-	    +String name
-	    +String version
-	    +String owner
+	    +id: String
+	    +name: String
+	    +version: String
+	    +owner: String
 	  }
 	  
 	  class Capability {
-	    +String domain
-	    +String taskType
-	    +String[] supportedLanguages
-	    +String[] inputFormats
-	    +String[] outputFormats
+	    +domain: String
+	    +taskType: String
+	    +supportedLanguages: String
+	    +inputFormats: String
+	    +outputFormats: String
 	  }
 	  
 	  class PerformanceKPI {
-	    +float accuracy
-	    +float latencyMs
-	    +float resourceConsumption
-	    +String robustnessMetrics
+	    +accuracy: float
+	    +latencyMs: float
+	    +resourceConsumption: String
+	    +robustnessMetrics: String
 	  }
 	  
 	  class Governance {
-	    +String license
-	    +String dataResidency
-	    +boolean GDPRCompliance
-	    +boolean auditTrailAvailable
+	    +license: String
+	    +dataResidency: String
+	    +GDPRCompliance: boolean
+	    +auditTrailAvailable: boolean
 	  }
 	  
 	  class FairnessEthics {
-	    +boolean biasDetected
-	    +String[] fairnessConstraints
-	    +String explanationCapabilities
+	    +biasDetected: boolean
+	    +fairnessConstraints: String
+	    +explanationCapabilities: String
 	  }
 	  
 	  class RuntimeEnvironment {
-	    +String runtime
-	    +String[] requiredLibraries
-	    +String[] hardwareAcceleration
+	    +runtime: String
+	    +requiredLibraries: String
+	    +hardwareAcceleration: String
 	  }
 	  
 	  class Provenance {
-	    +String[] trainingDataSources
-	    +String modelLineage
-	    +String lastUpdated
+	    +trainingDataSources: String
+	    +modelLineage: String
+	    +lastUpdated: String
 	  }
 	  
 	  class ContactInfo {
-	    +String maintainerEmail
-	    +String documentationUrl
+	    +maintainerEmail: String
+	    +documentationUrl: String
 	  }
 	  
 	  class AgentRepository {
-	    +searchByCapability()
-	    +searchByKPI()
-	    +filterByGovernance()
-	    +recommendAgent()
+	    <<service>>
 	  }
 	  
-	  Agent "1" -- "1" Capability
-	  Agent "1" -- "1" PerformanceKPI
-	  Agent "1" -- "1" Governance
-	  Agent "1" -- "1" FairnessEthics
-	  Agent "1" -- "1" RuntimeEnvironment
-	  Agent "1" -- "1" Provenance
-	  Agent "1" -- "1" ContactInfo
-	  AgentRepository "1" -- "*" Agent
+	  Agent --> Capability
+	  Agent --> PerformanceKPI
+	  Agent --> Governance
+	  Agent --> FairnessEthics
+	  Agent --> RuntimeEnvironment
+	  Agent --> Provenance
+	  Agent --> ContactInfo
+	  AgentRepository --> Agent : manages >
 	  
 	  @enduml