Add query support.