Cleaned up defining which metrics queried