Added MetricSet.
Tidied up MetricRegistry