Addressed concerns with custom metric code