Added support for warehouses