metrika core refactoring (1)