Added user query tool