Adding metrolink data and refactoring
After JDBC video
After JDBC video