Added few validations