Remove NumberRangeField, add Interval fields