Added few more validations.