Removed query specific 'wait for' method