#268 validations added