Modified models, added OR logic for validators