Changed architecture of AgentManager