Adding new AgentTypes.h and moving over to new constants