Need the passenger class here too