Unified some types (AgentActivity with Pattern). Simplified AgentController.