Update models and add abstraction layer for list view.