Updated ObjectDataView and Flat model