Refactored airport spec