Improved Flight Plan parsing