Added support for ranges and bounds.