Added Model validations refactored scopes