Add query support