adding airspace support