Updating to be consistent with latest metrics 3.0.0-beta2