Use latest metrics client and API, adapt to parameter changes