Add latency metrics
Better metric names