FirDatabase & AirportDatabase changes