BUG: Adding the deprecated UsageMetrics classes back to the solution.