Adding support for parallel queries