Started to add validations in the models