WIP: new-relic: refactor