Added new metrics implementation
Merge fix