Metrics refactoring. Include LOEM metrics.