Remove NumberRange, say hello to intervals