Added NumberRange support