Updated to match changes introduced in googlev3