Added token_type to TokenController according to RFC