Changed behaviour so it have AID and AgentInTree representation of agent