Modified Passenger class and Station class