Added hasPassenger and isPassenger flags