Feature/airspaces