Add missing imports
Merge branch 'universalApiQueryMethod' into testing