Refactor Address and fix some issues on Shipments