WIP - Separated metrics into locality groups