decorate some more models and implemented add_shipment_handler