Updating AIR to match new AIP protocols