Added ability to have sub-range