Primitive implementation of blocking queries added