Add CorrelationQuery and initial spec