Dramatically simplified using metrics-json