Change ShipmentHandler to class to make it play nice with 2-4-stable