Metrics refactored and aggregate contribution added