Added range query support