Made compatible with changes to identity metric