Added Metrics class