- added more functionality to the QueryManager