Refactored SemanticFlight