Added Coral query support