Improved NumberRange handling