Added some model validations