Added validations with message