Update service to services and add token_type