Modified Passenger class