adding queries and tools