Add metrics

I don't think we need this check for the current api. Are we keeping it for when the api or this helper grows?