Adding metrolink data and refactoring