Modified the Airport annotation APIs a bit