Revamp TokenController with Validator.