More modifications to enable metrics