Remove DataViewMode from methods and add to constructor. Regen code from
latest api data