Updated to use airport dataset