Additional work on Provider and Airport