Adds ShipmentStatusMapper and bug fixes