Fixed signify mappings and simplified airline conf