AgentManager and AgentOption moved to new structure