Add collection query support