Query Factory Changes