#465: Refactoring between validator