Updated to work with new metrics setup