Refactored validator controller.