Replaced range classes with a single interval class.