Added support for ranges