Refactoring, redo validator injection.