Added validations on models