Refactored metric organization to use different component GUIDs