Add query capabilities