Added multi-range query support