Added validations to models and 2 custom validator classes