Refactoring validators to become independent of default values