Added validations
Added validations