Query class connection unification