validator refactor cd