Adding support for ranges