Refactored weighted metrics