Multiple changes to support different trains lines and to upload NJT
data.