Capturing more metrics