Added validations
added validations