Added LegacyMetricsHandler