Moved it there for now; though that one is tied to QueryContext and commands.