Added validations
Merged