Add ModelView, improve CollectionView model handling