Improve GtfsReader design