Added validations
Merge branch 'validations'