AgentProfile and other modifications