Add support for range queries