More Generic approach
Merge branch 'extendMetrics'