Work in progress: refactoring validationservice for new state