Close #15 (upgrade to Metrics 3)