Refactoring apis to use AccessTokenType.