Changing some validation logic