Add support for ranged keys and number type.