Add support for ranges