claude-mpm 4.3.12__py3-none-any.whl → 4.3.13__py3-none-any.whl

claude_mpm/hooks/claude_hooks/tool_analysis.py

@@ -138,7 +138,7 @@ def summarize_todos(todos: list) -> dict:
     }
 
 
-def classify_tool_operation(tool_name: str, tool_input: dict) -> str:
+def classify_tool_operation(tool_name: str, tool_input: dict) -> str:  # noqa: PLR0911
     """Classify the type of operation being performed."""
     if tool_name in ["Read", "LS", "Glob", "Grep", "NotebookRead"]:
         return "read"
@@ -155,7 +155,7 @@ def classify_tool_operation(tool_name: str, tool_input: dict) -> str:
     return "other"
 
 
-def assess_security_risk(tool_name: str, tool_input: dict) -> str:
+def assess_security_risk(tool_name: str, tool_input: dict) -> str:  # noqa: PLR0911
     """Assess the security risk level of the tool operation."""
     if tool_name == "Bash":
         command = tool_input.get("command", "").lower()

claude_mpm/hooks/memory_integration_hook.py

@@ -234,7 +234,7 @@ class MemoryPostDelegationHook(PostDelegationHook):
             "context": "context",  # Current Technical Context
         }
 
-    def execute(self, context: HookContext) -> HookResult:
+    def execute(self, context: HookContext) -> HookResult:  # noqa: PLR0911
         """Extract and store learnings from delegation result.
 
         WHY: Capturing learnings immediately after task completion ensures we

claude_mpm/hooks/tool_call_interceptor.py

@@ -2,7 +2,7 @@
 
 import asyncio
 from collections import defaultdict
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Dict, List, Optional
 
 from claude_mpm.core.logger import get_logger
@@ -105,7 +105,7 @@ class ToolCallInterceptor:
                 "parameters": parameters.copy(),  # Copy to avoid modifying original
             },
             metadata=metadata or {},
-            timestamp=datetime.now(),
+            timestamp=datetime.now(timezone.utc),
         )
 
         # Run hooks

claude_mpm/models/agent_session.py

@@ -13,7 +13,7 @@ chronological order for session replay and analysis.
 
 import json
 from dataclasses import asdict, dataclass, field
-from datetime import datetime
+from datetime import datetime, timezone
 from enum import Enum
 from typing import Any, Dict, List, Optional, Set
 
@@ -204,7 +204,7 @@ class AgentSession:
         and metric updates.
         """
         if timestamp is None:
-            timestamp = datetime.utcnow().isoformat() + "Z"
+            timestamp = datetime.now(timezone.utc).isoformat() + "Z"
 
         # Categorize the event
         category = self._categorize_event(event_type, data)
@@ -232,7 +232,7 @@ class AgentSession:
 
         return event
 
-    def _categorize_event(self, event_type: str, data: Dict[str, Any]) -> EventCategory:
+    def _categorize_event(self, event_type: str, data: Dict[str, Any]) -> EventCategory:  # noqa: PLR0911
         """Categorize an event based on its type and data.
 
         WHY: Categories help with filtering and analysis of related events.
@@ -338,7 +338,7 @@ class AgentSession:
                             event.timestamp.replace("Z", "+00:00")
                         )
                         tool_op.duration_ms = int((end - start).total_seconds() * 1000)
-                    except:
+                    except Exception:
                         pass
 
                     event.correlation_id = corr_id
@@ -393,7 +393,7 @@ class AgentSession:
                 self.metrics.session_duration_ms = int(
                     (end - start).total_seconds() * 1000
                 )
-            except:
+            except Exception:
                 pass
 
         # Finalize any pending delegations

claude_mpm/services/__init__.py

@@ -13,7 +13,7 @@ New structure:
 
 
 # Use lazy imports to prevent circular dependency issues
-def __getattr__(name):
+def __getattr__(name):  # noqa: PLR0911
     """Lazy import to prevent circular dependencies."""
     if name == "TicketManager":
         from .ticket_manager import TicketManager

claude_mpm/services/agent_capabilities_service.py

@@ -215,7 +215,7 @@ class AgentCapabilitiesService(BaseService, AgentCapabilitiesInterface):
                 self.logger.debug(f"Could not parse agent {agent_file}: {e}")
                 continue
 
-    def _categorize_agent(self, agent_id: str, content: str) -> str:
+    def _categorize_agent(self, agent_id: str, content: str) -> str:  # noqa: PLR0911
         """Categorize an agent based on its ID and content."""
         agent_id_lower = agent_id.lower()
         content_lower = content.lower()

claude_mpm/services/agents/agent_builder.py

@@ -10,7 +10,7 @@ This service provides comprehensive agent lifecycle management including:
 
 import json
 import re
-from datetime import datetime
+from datetime import datetime, timezone
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple
 
@@ -108,7 +108,7 @@ class AgentBuilderService:
         agent_metadata = {
             "description": description,
             "version": "1.0.0",
-            "created": datetime.now().isoformat(),
+            "created": datetime.now(timezone.utc).isoformat(),
             "author": "Agent Manager",
             "category": "custom",
         }
@@ -179,7 +179,7 @@ class AgentBuilderService:
             {
                 "base_agent": base_agent_id,
                 "variant": True,
-                "variant_created": datetime.now().isoformat(),
+                "variant_created": datetime.now(timezone.utc).isoformat(),
             }
         )
 

claude_mpm/services/agents/deployment/agent_deployment.py

@@ -799,7 +799,8 @@ class AgentDeploymentService(ConfigServiceBase, AgentDeploymentInterface):
                 if filtered_agents and comparison_results.get("version_upgrades"):
                     # Filter upgrades to only those actually being deployed
                     deployed_upgrades = [
-                        upgrade for upgrade in comparison_results["version_upgrades"]
+                        upgrade
+                        for upgrade in comparison_results["version_upgrades"]
                         if upgrade["name"] in filtered_agents
                     ]
 

claude_mpm/services/agents/deployment/agent_discovery_service.py

@@ -219,7 +219,9 @@ class AgentDiscoveryService:
             # Handle capabilities as either dict or list
             if isinstance(capabilities, list):
                 # If capabilities is a list (like in php-engineer.json), treat it as capabilities list
-                tools_list = template_data.get("tools", [])  # Look for tools at root level
+                tools_list = template_data.get(
+                    "tools", []
+                )  # Look for tools at root level
                 model_value = template_data.get("model", "sonnet")
             else:
                 # If capabilities is a dict, extract tools and model from it
@@ -228,9 +230,13 @@ class AgentDiscoveryService:
 
             agent_info = {
                 "name": metadata.get("name", template_file.stem),
-                "description": metadata.get("description", template_data.get("description", "No description available")),
+                "description": metadata.get(
+                    "description",
+                    template_data.get("description", "No description available"),
+                ),
                 "type": template_data.get(
-                    "agent_type", metadata.get("category", template_data.get("category", "agent"))
+                    "agent_type",
+                    metadata.get("category", template_data.get("category", "agent")),
                 ),  # Extract agent type
                 "version": template_data.get(
                     "agent_version",

claude_mpm/services/agents/deployment/agent_filesystem_manager.py

@@ -183,9 +183,11 @@ class AgentFileSystemManager:
         try:
             # Generate backup directory name if not provided
             if not backup_dir:
-                import datetime
+                from datetime import datetime, timezone
 
-                timestamp = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
+                timestamp = datetime.now(timezone.utc).strftime(
+                    "%Y%m%d_%H%M%S"
+                )
                 backup_dir = agents_dir.parent / f"agents_backup_{timestamp}"
 
             # Create backup
@@ -324,7 +326,7 @@ class AgentFileSystemManager:
 
     def _convert_yaml_to_markdown(self, yaml_content: str, agent_name: str) -> str:
         """Convert YAML agent content to Markdown format with frontmatter."""
-        from datetime import datetime
+        from datetime import datetime, timezone
 
         # Extract YAML fields (simplified parsing)
         name = self._extract_yaml_field(yaml_content, "name") or agent_name
@@ -356,8 +358,8 @@ name: {name}
 description: "{description}"
 version: "{version}"
 author: "claude-mpm@anthropic.com"
-created: "{datetime.now().isoformat()}Z"
-updated: "{datetime.now().isoformat()}Z"
+created: "{datetime.now(timezone.utc).isoformat()}Z"
+updated: "{datetime.now(timezone.utc).isoformat()}Z"
 tags: ["{agent_name}", "mpm-framework"]
 tools: {tools_list}
 model: "sonnet"

claude_mpm/services/agents/deployment/agent_lifecycle_manager.py

@@ -32,6 +32,7 @@ Created for ISS-0118: Agent Registry and Hierarchical Discovery System
 
 import asyncio
 import time
+from datetime import datetime, timezone
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
@@ -52,6 +53,7 @@ from claude_mpm.services.agents.registry.modification_tracker import (
     ModificationType,
 )
 from claude_mpm.services.memory.cache.shared_prompt_cache import SharedPromptCache
+from claude_mpm.core.unified_paths import get_path_manager
 from claude_mpm.utils.path_operations import path_ops
 
 # Import extracted services
@@ -758,7 +760,7 @@ class AgentLifecycleManager(BaseService):
             backup_dir = get_path_manager().get_tracking_dir() / "backups"
             path_ops.ensure_dir(backup_dir)
 
-            timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+            timestamp = datetime.now(timezone.utc).strftime("%Y%m%d_%H%M%S")
             backup_filename = f"{agent_name}_deleted_{timestamp}{source_path.suffix}"
             backup_path = backup_dir / backup_filename
 

claude_mpm/services/agents/deployment/agent_metrics_collector.py

@@ -227,7 +227,7 @@ class AgentMetricsCollector:
             return "validation_error"
         return "other_error"
 
-    def _extract_agent_type(self, agent_name: str) -> str:
+    def _extract_agent_type(self, agent_name: str) -> str:  # noqa: PLR0911
         """
         Extract agent type from agent name for categorization.
 

claude_mpm/services/agents/deployment/agent_operation_service.py

@@ -479,9 +479,9 @@ class AgentOperationService(BaseService):
             backup_dir = get_path_manager().get_tracking_dir() / "backups"
             path_ops.ensure_dir(backup_dir)
 
-            from datetime import datetime
+            from datetime import datetime, timezone
 
-            timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+            timestamp = datetime.now(timezone.utc).strftime("%Y%m%d_%H%M%S")
             backup_filename = f"{agent_name}_deleted_{timestamp}{source_path.suffix}"
             backup_path = backup_dir / backup_filename
 

claude_mpm/services/agents/deployment/agent_state_service.py

@@ -59,9 +59,9 @@ class AgentLifecycleRecord:
     @property
     def last_modified_datetime(self):
         """Get last modified as datetime."""
-        from datetime import datetime
+        from datetime import datetime, timezone
 
-        return datetime.fromtimestamp(self.last_modified)
+        return datetime.fromtimestamp(self.last_modified, tz=timezone.utc)
 
 
 @dataclass

claude_mpm/services/agents/deployment/agent_template_builder.py

@@ -230,7 +230,7 @@ class AgentTemplateBuilder:
         )
 
         # Convert tools list to comma-separated string (without spaces for compatibility)
-        tools_str = ",".join(tools)
+        ",".join(tools)
 
         # Map model names to Claude Code format (as required)
         model_map = {

claude_mpm/services/agents/deployment/agent_versioning.py

@@ -30,5 +30,5 @@ class AgentVersionManager:
             for part in parts:
                 int(part)
             return True
-        except:
+        except Exception:
             return False

claude_mpm/services/agents/deployment/deployment_wrapper.py

@@ -1,5 +1,6 @@
 """Temporary wrapper to provide backward compatibility for CLI commands."""
 
+import contextlib
 from pathlib import Path
 from typing import Any, Dict
 
@@ -101,10 +102,8 @@ class DeploymentServiceWrapper:
                             # Extract frontmatter
                             parts = content.split("---", 2)
                             if len(parts) >= 2:
-                                try:
+                                with contextlib.suppress(yaml.YAMLError):
                                     metadata = yaml.safe_load(parts[1])
-                                except yaml.YAMLError:
-                                    pass
 
                         return {
                             "name": agent_name,

claude_mpm/services/agents/deployment/pipeline/steps/agent_processing_step.py

@@ -229,7 +229,7 @@ class AgentProcessingStep(BaseDeploymentStep):
                 cwd = Path.cwd()
                 if str(cwd) in template_str:
                     return "project"
-            except:
+            except Exception:
                 pass
 
         # Check if it's a user agent

claude_mpm/services/agents/loading/agent_profile_loader.py

@@ -24,7 +24,7 @@ import json
 import logging
 import os
 from dataclasses import dataclass, field
-from datetime import datetime
+from datetime import datetime, timezone
 from enum import Enum
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple
@@ -227,7 +227,9 @@ class AgentProfileLoader(BaseService):
         # Check cache first
         if use_cache and agent_name in self.profile_cache:
             profile = self.profile_cache[agent_name]
-            if (datetime.now() - profile.loaded_at).seconds < self.cache_ttl:
+            if (
+                datetime.now(timezone.utc) - profile.loaded_at
+            ).seconds < self.cache_ttl:
                 self.load_metrics[f"{agent_name}_cache_hit"] = (
                     asyncio.get_event_loop().time() - start_time
                 )
@@ -322,7 +324,7 @@ class AgentProfileLoader(BaseService):
                 try:
                     data = yaml.safe_load(content)
                     instructions = data.get("instructions", "")
-                except:
+                except Exception:
                     data = json.loads(content)
                     instructions = data.get("instructions", "")
 

claude_mpm/services/agents/loading/base_agent_manager.py

@@ -9,7 +9,7 @@ Enforces template structure and provides section-specific update methods.
 
 import logging
 from dataclasses import dataclass, field
-from datetime import datetime
+from datetime import datetime, timezone
 from enum import Enum
 from pathlib import Path
 from typing import Any, Dict, List, Optional
@@ -358,7 +358,7 @@ class BaseAgentManager(ConfigServiceBase):
 
     def _create_backup(self) -> Path:
         """Create a timestamped backup of base_agent.md."""
-        timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+        timestamp = datetime.now(timezone.utc).strftime("%Y%m%d_%H%M%S")
         backup_path = self.base_agent_path.parent / f"base_agent_{timestamp}.backup"
 
         if self.base_agent_path.exists():

claude_mpm/services/agents/local_template_manager.py

@@ -15,7 +15,7 @@ Key Features:
 
 import json
 from dataclasses import dataclass
-from datetime import datetime
+from datetime import datetime, timezone
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple, Union
 
@@ -57,9 +57,9 @@ class LocalAgentTemplate:
         if self.configuration is None:
             self.configuration = {}
         if self.created_at is None:
-            self.created_at = datetime.now().isoformat()
+            self.created_at = datetime.now(timezone.utc).isoformat()
         if self.updated_at is None:
-            self.updated_at = datetime.now().isoformat()
+            self.updated_at = datetime.now(timezone.utc).isoformat()
 
         # Ensure metadata has required fields
         if "name" not in self.metadata:
@@ -303,7 +303,7 @@ class LocalAgentTemplateManager:
         target_dir.mkdir(parents=True, exist_ok=True)
 
         # Update timestamp
-        template.updated_at = datetime.now().isoformat()
+        template.updated_at = datetime.now(timezone.utc).isoformat()
 
         # Save to JSON file
         template_file = target_dir / f"{template.agent_id}.json"
@@ -455,7 +455,7 @@ class LocalAgentTemplateManager:
 
         try:
             # Create backup directory
-            timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+            timestamp = datetime.now(timezone.utc).strftime("%Y%m%d_%H%M%S")
             backup_dir = (
                 self.working_directory
                 / ".claude-mpm"
@@ -633,7 +633,7 @@ class LocalAgentTemplateManager:
 
         # Update template version
         template.agent_version = new_version
-        template.updated_at = datetime.now().isoformat()
+        template.updated_at = datetime.now(timezone.utc).isoformat()
 
         # Save updated template
         self.save_local_template(template)

claude_mpm/services/agents/management/agent_management_service.py

@@ -13,7 +13,7 @@ Uses python-frontmatter and mistune for markdown parsing as recommended.
 
 import logging
 import re
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Dict, List, Optional
 
 import frontmatter
@@ -156,7 +156,7 @@ class AgentManager:
         # Increment version if requested
         if increment_version:
             agent_def.metadata.increment_serial_version()
-            agent_def.metadata.last_updated = datetime.now()
+            agent_def.metadata.last_updated = datetime.now(timezone.utc)
 
         # Write back
         agent_path = self._find_agent_file(name)
@@ -234,7 +234,7 @@ class AgentManager:
         # Increment version
         if increment_version:
             agent_def.metadata.increment_serial_version()
-            agent_def.metadata.last_updated = datetime.now()
+            agent_def.metadata.last_updated = datetime.now(timezone.utc)
 
         # Write back
         return self.update_agent(name, {}, increment_version=False)

claude_mpm/services/agents/memory/content_manager.py

@@ -14,7 +14,7 @@ This module provides:
 
 import logging
 import re
-from datetime import datetime
+from datetime import datetime, timezone
 from difflib import SequenceMatcher
 from typing import Any, Dict, List, Optional, Tuple
 
@@ -203,7 +203,7 @@ class MemoryContentManager:
         Returns:
             str: Content with updated timestamp
         """
-        timestamp = datetime.now().isoformat() + "Z"
+        timestamp = datetime.now(timezone.utc).isoformat() + "Z"
         # Handle both old and new timestamp formats
         content = re.sub(
             r"<!-- Last Updated: .+? -->",
@@ -260,7 +260,7 @@ class MemoryContentManager:
 
             if not has_timestamp:
                 new_lines.append(
-                    f"<!-- Last Updated: {datetime.now().isoformat()}Z -->"
+                    f"<!-- Last Updated: {datetime.now(timezone.utc).isoformat()}Z -->"
                 )
                 new_lines.append("")
             else:

claude_mpm/services/agents/memory/memory_format_service.py

@@ -3,7 +3,7 @@
 
 import logging
 import re
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Dict, List
 
 
@@ -26,7 +26,7 @@ class MemoryFormatService:
         """
         # Build header
         header = f"# {agent_id.title()} Agent Memory\n\n"
-        header += f"Last Updated: {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}\n\n"
+        header += f"Last Updated: {datetime.now(timezone.utc).strftime('%Y-%m-%d %H:%M:%S')}\n\n"
         header += "## Learnings\n\n"
 
         # Build item list

claude_mpm/services/agents/memory/template_generator.py

@@ -13,7 +13,7 @@ This module provides:
 """
 
 import logging
-from datetime import datetime
+from datetime import datetime, timezone
 from pathlib import Path
 from typing import Any, Dict
 
@@ -58,7 +58,7 @@ class MemoryTemplateGenerator:
         """
         # Convert agent_id to proper name, handling cases like "test_agent" -> "Test"
         agent_id.replace("_agent", "").replace("_", " ").title()
-        datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M:%S")
 
         # Create a simple template that agents will populate through learning
         return self._create_basic_memory_template(agent_id, limits)
@@ -75,7 +75,7 @@ class MemoryTemplateGenerator:
         Returns:
             str: Basic memory template
         """
-        timestamp = datetime.now().isoformat() + "Z"
+        timestamp = datetime.now(timezone.utc).isoformat() + "Z"
 
         return f"""# Agent Memory: {agent_id}
 <!-- Last Updated: {timestamp} -->

claude_mpm/services/agents/registry/__init__.py

@@ -4,8 +4,8 @@ from claude_mpm.core.unified_agent_registry import (
     AgentMetadata,
     AgentTier,
     AgentType,
-    UnifiedAgentRegistry as AgentRegistry,
 )
+from claude_mpm.core.unified_agent_registry import UnifiedAgentRegistry as AgentRegistry
 
 from .deployed_agent_discovery import DeployedAgentDiscovery
 from .modification_tracker import (

claude_mpm/services/agents/registry/modification_tracker.py

@@ -30,7 +30,7 @@ import shutil
 import time
 import uuid
 from dataclasses import asdict, dataclass, field
-from datetime import datetime
+from datetime import datetime, timezone
 from enum import Enum
 from typing import Any, Callable, Dict, List, Optional, Set, Tuple
 
@@ -90,7 +90,7 @@ class AgentModification:
     @property
     def modification_datetime(self) -> datetime:
         """Get modification timestamp as datetime."""
-        return datetime.fromtimestamp(self.timestamp)
+        return datetime.fromtimestamp(self.timestamp, tz=timezone.utc)
 
     @property
     def age_seconds(self) -> float:

claude_mpm/services/async_session_logger.py

@@ -22,7 +22,7 @@ import os
 import sys
 import time
 from dataclasses import asdict, dataclass
-from datetime import datetime
+from datetime import datetime, timezone
 from enum import Enum
 from queue import Full, Queue
 from threading import Lock, Thread
@@ -184,7 +184,7 @@ class AsyncSessionLogger:
                 return session_id
 
         # Generate timestamp-based session ID
-        session_id = datetime.now().strftime("%Y%m%d_%H%M%S")
+        session_id = datetime.now(timezone.utc).strftime("%Y%m%d_%H%M%S")
         logger.info(f"Generated session ID: {session_id}")
         return session_id
 
@@ -406,7 +406,7 @@ class AsyncSessionLogger:
             agent_name = metadata["agent"].replace(" ", "_").lower()
 
         # Create timestamp with microsecond precision
-        now = datetime.now()
+        now = datetime.now(timezone.utc)
         timestamp = now.isoformat()
         microseconds = now.microsecond
 

claude_mpm/services/claude_session_logger.py

@@ -13,7 +13,7 @@ Configuration via .claude-mpm/configuration.yaml.
 import json
 import logging
 import os
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Dict, Optional
 
 # Import configuration manager
@@ -133,7 +133,7 @@ class ClaudeSessionLogger:
         # Generate a default based on timestamp if nothing found
         if not session_id:
             # Use a timestamp-based session ID as fallback
-            session_id = datetime.now().strftime("%Y%m%d_%H%M%S")
+            session_id = datetime.now(timezone.utc).strftime("%Y%m%d_%H%M%S")
             logger.info(f"No Claude session ID found, using generated: {session_id}")
         else:
             logger.info(f"Using Claude session ID: {session_id}")
@@ -156,7 +156,7 @@ class ClaudeSessionLogger:
         agent_name = agent_name.replace(" ", "_").lower()
 
         # Generate timestamp with microseconds for uniqueness
-        timestamp = datetime.now().strftime("%Y%m%d_%H%M%S_%f")
+        timestamp = datetime.now(timezone.utc).strftime("%Y%m%d_%H%M%S_%f")
 
         # Create filename: session_id-agent-timestamp.json
         return f"{self.session_id}-{agent_name}-{timestamp}.json"
@@ -216,7 +216,7 @@ class ClaudeSessionLogger:
 
         # Prepare response data with standardized field names
         response_data = {
-            "timestamp": datetime.now().isoformat(),
+            "timestamp": datetime.now(timezone.utc).isoformat(),
             "session_id": self.session_id,
             "request": request_summary,  # Standardized field name
             "response": response_content,  # Already correct

claude_mpm/services/cli/agent_listing_service.py

@@ -336,7 +336,7 @@ class AgentListingService(IAgentListingService):
             self.logger.error(f"Error listing agents by tier: {e}", exc_info=True)
             return AgentTierInfo(project=[], user=[], system=[])
 
-    def get_agent_details(self, agent_name: str) -> Optional[Dict[str, Any]]:
+    def get_agent_details(self, agent_name: str) -> Optional[Dict[str, Any]]:  # noqa: PLR0911
         """Get detailed information for a specific agent."""
         cache_key = f"agent_details_{agent_name}"
         cached = self._get_from_cache(cache_key)

claude_mpm/services/cli/agent_validation_service.py

@@ -1,3 +1,4 @@
+import re
 """
 Agent Validation Service
 ========================