Shifting MetricRequest to a separate file