Unify how metrics are handled