Extension to warehouse conditions

Summary
Extension to warehouse conditions