Add airspace support