Updated Metrics implementation.