Revamp GrantType/* with Validator.