Rebuilt Airport config classes to Scott's new specs