Introducing Validator and Editor together with corresponding refactoring.