Removed static calls to Metric Manager