Support for combatMode
Support for waypoint behaviour