Refactored Passenger Spec