Refactored AirbaseController