Added passenger and train classes