Add Calypso query support.