Concepts updates and DigitalMetricAdapter added