Added Metrics (Update 0.1.25)