Upgrade to AirBase 5