Added switch/default sections; removed HighNumber DataItem (unallowed combination, HighNumber represented as String DataItem)