Updated Model - additional where constraints.