PLA-1305 metrics refactoring