Small Changes to warehouse entities