Added more validations