Modify logic, rename Manager to Validator
Revert 4c5e6a5b5bef547ed0b251f51689dbb14be43c2c