StockManager and Shipment improvements