Added custom validators for models