Shipping refactoring