Added support for extra GTFS fields