Update MetricStore to use Q