More model validations added