Clean code for Warehouse.

Added additional required methods
We don't know why this is being synced