Monthly metrics refactoring