Initial 3.0 work - change to use interface for TimedMetric
Refactor and cleanup for 3.0