Added Metrics 1.3.6