Added WaypointManagerS and EventMessenger