Added Query and QueryManager to be used with ForEach