Major updates for Airspace release