Add query tools