FlightManager refactor