Add support for ranged keys