Integrated the old Person and Airport annotators