Tom : Moved the Air methods to Air module