Added support for Range