From d0991936d630027f8beb09db0779e29c5c45dbd1 Mon Sep 17 00:00:00 2001
From: FinnStutzenstein <finn.stutzenstein@hotmail.de>
Date: Fri, 1 Feb 2019 13:56:08 +0100
Subject: [PATCH] ViewModelStore, register repositories, improve view model
 relations

---
 client/src/app/core/app-config.ts             |  15 +-
 .../core/core-services/app-load.service.ts    |  31 +-
 .../core/core-services/autoupdate.service.ts  |   3 +-
 .../collectionStringMapper.service.ts         | 134 ++++++--
 .../core/core-services/data-store.service.ts  |  23 +-
 .../core/core-services/operator.service.ts    |  77 ++++-
 .../core/core-services/projector.service.ts   |  41 ++-
 .../core/core-services/time-travel.service.ts |   2 +-
 .../view-model-store.service.spec.ts          |  15 +
 .../core-services/view-model-store.service.ts |  90 +++++
 client/src/app/core/core.module.ts            |   6 +-
 client/src/app/core/onAfterAppsLoaded.ts      |   9 +
 ...pec.ts => item-repository.service.spec.ts} |   8 +-
 ....service.ts => item-repository.service.ts} |  30 +-
 .../agenda/topic-repository.service.ts        |  21 +-
 .../assignment-repository.service.ts          |  18 +-
 .../app/core/repositories/base-repository.ts  |  48 ++-
 .../common/chatmessage-repository.service.ts  |   9 +-
 .../config}/config-repository.service.spec.ts |   0
 .../config}/config-repository.service.ts      |  13 +-
 .../history/history-repository.service.ts     |  17 +-
 .../mediafile-repository.service.ts           |   7 +-
 .../motions/category-repository.service.ts    |   4 +-
 ...hange-recommendation-repository.service.ts |  62 ++--
 .../motion-block-repository.service.ts        |   9 +-
 ...tion-comment-section-repository.service.ts |  13 +-
 .../motions/motion-repository.service.ts      |  61 ++--
 .../statute-paragraph-repository.service.ts   |   4 +-
 .../motions/workflow-repository.service.ts    |  10 +-
 .../projector/countdown-repository.service.ts |   4 +-
 .../projector/projector-repository.service.ts |   4 +-
 .../projectormessage-repository.service.ts    |   9 +-
 .../tags/tag-repository.service.ts            |   4 +-
 .../users/group-repository.service.ts         |   4 +-
 .../users/personal-note-repository.service.ts |  20 +-
 .../users/user-repository.service.ts          |  24 +-
 .../core/ui-services/count-users.service.ts   |   2 +-
 .../core/ui-services/personal-note.service.ts |   2 +-
 .../app/core/ui-services/search.service.ts    |  21 +-
 .../src/app/core/ui-services/tree.service.ts  |   2 +-
 .../fullscreen-projector.component.ts         |   2 +-
 .../choice-dialog/choice-dialog.component.ts  |   2 +-
 .../copyright-sign.component.ts               |   2 +-
 .../projector/projector.component.ts          |   6 +-
 .../src/app/shared/components/selectable.ts   |   2 +-
 .../sorting-tree.component.spec.ts            |   2 +-
 .../sorting-tree/sorting-tree.component.ts    |   2 +-
 .../app/shared/directives/perms.directive.ts  |   2 +-
 client/src/app/shared/models/agenda/item.ts   |  14 +-
 .../src/app/shared/models/agenda/speaker.ts   |   8 -
 .../shared/models/assignments/assignment.ts   |  19 +-
 .../src/app/shared/models/base/base-model.ts  |  38 +--
 .../src/app/shared/models/base/collection.ts  |   6 +
 .../app/shared/models/core/chat-message.ts    |   7 +-
 client/src/app/shared/models/core/config.ts   |   7 +-
 .../src/app/shared/models/core/countdown.ts   |   6 +-
 client/src/app/shared/models/core/history.ts  |   7 +-
 .../shared/models/core/projector-message.ts   |   6 +-
 .../src/app/shared/models/core/projector.ts   |  11 +-
 client/src/app/shared/models/core/tag.ts      |  19 +-
 .../app/shared/models/mediafiles/mediafile.ts |  19 +-
 .../src/app/shared/models/motions/category.ts |  43 +--
 .../app/shared/models/motions/motion-block.ts |  31 +-
 .../models/motions/motion-change-reco.ts      |  10 +-
 .../models/motions/motion-comment-section.ts  |  10 +-
 .../src/app/shared/models/motions/motion.ts   |  50 +--
 .../models/motions/statute-paragraph.ts       |  28 +-
 .../src/app/shared/models/motions/workflow.ts |  16 +-
 client/src/app/shared/models/topics/topic.ts  |  39 +--
 client/src/app/shared/models/users/group.ts   |   3 +-
 .../app/shared/models/users/personal-note.ts  |   4 +-
 client/src/app/shared/models/users/user.ts    |  86 +----
 client/src/app/site/agenda/agenda.config.ts   |  14 +-
 .../agenda-list/agenda-list.component.ts      |   4 +-
 .../agenda-sort/agenda-sort.component.ts      |   4 +-
 .../speaker-list/speaker-list.component.ts    |  34 +-
 .../topic-detail/topic-detail.component.html  | 143 ++++----
 .../topic-detail/topic-detail.component.ts    |  35 +-
 .../src/app/site/agenda/models/view-item.ts   |  18 +-
 .../app/site/agenda/models/view-speaker.ts    |  35 +-
 .../src/app/site/agenda/models/view-topic.ts  |  87 +++--
 .../services/agenda-filter-list.service.ts    |   4 +-
 .../site/assignments/assignments.config.ts    |   2 +
 .../assignments/models/view-assignment.ts     |  51 ++-
 .../base/agenda-information.ts                |  13 +-
 .../base/base-agenda-view-model.ts}           |  29 +-
 ...odel.ts => base-projectable-view-model.ts} |   6 +-
 client/src/app/site/base/base-view-model.ts   |  32 +-
 .../models => site}/base/displayable.ts       |   0
 client/src/app/site/base/projectable.ts       |   2 +-
 .../models => site}/base/searchable.ts        |   2 +-
 client/src/app/site/common/common.config.ts   |  10 +-
 .../components/start/start.component.ts       |   3 +-
 .../site/common/models/view-chatmessage.ts    |  16 +-
 .../config-field/config-field.component.ts    |   6 +-
 .../config-list/config-list.component.ts      |   2 +-
 client/src/app/site/config/config.config.ts   |   7 +-
 .../src/app/site/config/models/view-config.ts |   6 +-
 .../history-list/history-list.component.ts    |  36 +-
 client/src/app/site/history/history.config.ts |  10 +-
 .../app/site/history/models/view-history.ts   |  33 +-
 .../app/site/mediafiles/mediafile.config.ts   |   2 +
 .../site/mediafiles/models/view-mediafile.ts  |  63 ++--
 .../services/mediafile-filter.service.ts      |   2 +-
 .../manage-submitters.component.spec.ts       |   3 +-
 .../manage-submitters.component.ts            |  31 +-
 .../motion-block-list.component.ts            |  23 +-
 ...on-change-recommendation.component.spec.ts |   4 +-
 .../motion-change-recommendation.component.ts |   6 +-
 .../motion-comments.component.ts              |   2 +-
 .../motion-detail-diff.component.spec.ts      |   7 +-
 .../motion-detail-diff.component.ts           |  20 +-
 ...iginal-change-recommendations.component.ts |  24 +-
 .../motion-detail.component.html              |   2 +-
 .../motion-detail/motion-detail.component.ts  |  94 ++++--
 .../motion-poll/motion-poll.component.ts      |   8 +-
 .../app/site/motions/models/view-category.ts  |  71 ++--
 ...-reco.ts => view-change-recommendation.ts} |  48 ++-
 .../site/motions/models/view-create-motion.ts |  26 +-
 .../site/motions/models/view-motion-block.ts  |  57 +++-
 .../models/view-motion-comment-section.ts     |  46 ++-
 .../app/site/motions/models/view-motion.ts    | 315 ++++++++++--------
 .../motions/models/view-statute-paragraph.ts  |  35 +-
 .../app/site/motions/models/view-workflow.ts  |  34 +-
 client/src/app/site/motions/motions.config.ts |  31 +-
 .../services/local-permissions.service.ts     |   6 +-
 .../services/motion-multiselect.service.ts    |   6 +-
 .../services/motion-pdf-catalog.service.ts    |  10 +-
 .../projector-detail.component.ts             |  12 +-
 .../site/projector/models/view-countdown.ts   |  19 +-
 .../site/projector/models/view-projector.ts   |  30 +-
 .../projector/models/view-projectormessage.ts |  19 +-
 .../app/site/projector/projector.config.ts    |  18 +-
 ...rrent-list-of-of-speakers-slide.service.ts |  28 +-
 .../services/projector-data.service.ts        |   1 +
 client/src/app/site/site.component.ts         |   2 +-
 client/src/app/site/tags/models/view-tag.ts   |  30 +-
 client/src/app/site/tags/tag.config.ts        |  11 +-
 .../components/password/password.component.ts |  12 +-
 .../user-detail/user-detail.component.html    |   4 +-
 .../user-detail/user-detail.component.ts      |  25 +-
 .../user-import-list.component.html           |   2 +-
 .../user-list/user-list.component.ts          |   2 +-
 .../src/app/site/users/models/view-group.ts   |  13 +-
 .../site/users/models/view-personal-note.ts   |  27 ++
 client/src/app/site/users/models/view-user.ts | 174 ++++++----
 .../users/services/user-import.service.ts     |   4 +-
 .../users/services/user-sort-list.service.ts  |   2 +-
 client/src/app/site/users/users.config.ts     |  20 +-
 openslides/utils/consumers.py                 |   4 +-
 150 files changed, 1943 insertions(+), 1519 deletions(-)
 create mode 100644 client/src/app/core/core-services/view-model-store.service.spec.ts
 create mode 100644 client/src/app/core/core-services/view-model-store.service.ts
 create mode 100644 client/src/app/core/onAfterAppsLoaded.ts
 rename client/src/app/core/repositories/agenda/{agenda-repository.service.spec.ts => item-repository.service.spec.ts} (52%)
 rename client/src/app/core/repositories/agenda/{agenda-repository.service.ts => item-repository.service.ts} (91%)
 rename client/src/app/{site/config/services => core/repositories/config}/config-repository.service.spec.ts (100%)
 rename client/src/app/{site/config/services => core/repositories/config}/config-repository.service.ts (96%)
 create mode 100644 client/src/app/shared/models/base/collection.ts
 rename client/src/app/{shared/models => site}/base/agenda-information.ts (52%)
 rename client/src/app/{shared/models/base/agenda-base-model.ts => site/base/base-agenda-view-model.ts} (52%)
 rename client/src/app/site/base/{base-projectable-model.ts => base-projectable-view-model.ts} (58%)
 rename client/src/app/{shared/models => site}/base/displayable.ts (100%)
 rename client/src/app/{shared/models => site}/base/searchable.ts (88%)
 rename client/src/app/site/motions/models/{view-change-reco.ts => view-change-recommendation.ts} (53%)
 create mode 100644 client/src/app/site/users/models/view-personal-note.ts

diff --git a/client/src/app/core/app-config.ts b/client/src/app/core/app-config.ts
index cf278331b..487042193 100644
--- a/client/src/app/core/app-config.ts
+++ b/client/src/app/core/app-config.ts
@@ -1,20 +1,23 @@
+import { Type } from '@angular/core';
+
 import { ModelConstructor, BaseModel } from '../shared/models/base/base-model';
 import { MainMenuEntry } from './core-services/main-menu.service';
-import { Searchable } from '../shared/models/base/searchable';
-import { Type } from '@angular/core';
+import { Searchable } from '../site/base/searchable';
 import { BaseRepository } from './repositories/base-repository';
+import { BaseViewModel, ViewModelConstructor } from 'app/site/base/base-view-model';
 
 interface BaseModelEntry {
     collectionString: string;
     repository: Type<BaseRepository<any, any>>;
-}
-
-export interface ModelEntry extends BaseModelEntry {
     model: ModelConstructor<BaseModel>;
 }
 
+export interface ModelEntry extends BaseModelEntry {
+    viewModel: ViewModelConstructor<BaseViewModel>;
+}
+
 export interface SearchableModelEntry extends BaseModelEntry {
-    model: new (...args: any[]) => BaseModel & Searchable;
+    viewModel: new (...args: any[]) => BaseViewModel & Searchable;
     searchOrder: number;
 }
 
diff --git a/client/src/app/core/core-services/app-load.service.ts b/client/src/app/core/core-services/app-load.service.ts
index e56d5e38e..42d1ee659 100644
--- a/client/src/app/core/core-services/app-load.service.ts
+++ b/client/src/app/core/core-services/app-load.service.ts
@@ -14,9 +14,11 @@ import { TagAppConfig } from '../../site/tags/tag.config';
 import { MainMenuService } from './main-menu.service';
 import { HistoryAppConfig } from 'app/site/history/history.config';
 import { SearchService } from '../ui-services/search.service';
-import { isSearchable } from '../../shared/models/base/searchable';
+import { isSearchable } from '../../site/base/searchable';
 import { ProjectorAppConfig } from 'app/site/projector/projector.config';
 import { BaseRepository } from 'app/core/repositories/base-repository';
+import { OnAfterAppsLoaded } from '../onAfterAppsLoaded';
+import { ServicesToLoadOnAppsLoaded } from '../core.module';
 
 /**
  * A list of all app configurations of all delivered apps.
@@ -63,16 +65,21 @@ export class AppLoadService {
             const plugin = await import('../../../../../plugins/' + pluginName + '/' + pluginName);
             plugin.main();
         }*/
+        const repositories: OnAfterAppsLoaded[] = [];
         appConfigs.forEach((config: AppConfig) => {
             if (config.models) {
                 config.models.forEach(entry => {
                     let repository: BaseRepository<any, any> = null;
-                    if (entry.repository) {
-                        repository = this.injector.get(entry.repository);
-                    }
-                    this.modelMapper.registerCollectionElement(entry.collectionString, entry.model, repository);
+                    repository = this.injector.get(entry.repository);
+                    repositories.push(repository);
+                    this.modelMapper.registerCollectionElement(
+                        entry.collectionString,
+                        entry.model,
+                        entry.viewModel,
+                        repository
+                    );
                     if (this.isSearchableModelEntry(entry)) {
-                        this.searchService.registerModel(entry.collectionString, entry.model, entry.searchOrder);
+                        this.searchService.registerModel(entry.collectionString, entry.viewModel, entry.searchOrder);
                     }
                 });
             }
@@ -80,6 +87,16 @@ export class AppLoadService {
                 this.mainMenuService.registerEntries(config.mainMenuEntries);
             }
         });
+
+        // Collect all services to notify for the OnAfterAppsLoadedHook
+        const onAfterAppsLoadedItems = ServicesToLoadOnAppsLoaded.map(service => {
+            return this.injector.get(service);
+        }).concat(repositories);
+
+        // Notify them.
+        onAfterAppsLoadedItems.forEach(repo => {
+            repo.onAfterAppsLoaded();
+        });
     }
 
     private isSearchableModelEntry(entry: ModelEntry | SearchableModelEntry): entry is SearchableModelEntry {
@@ -87,7 +104,7 @@ export class AppLoadService {
             // We need to double check, because Typescipt cannot check contructors. If typescript could differentiate
             // between  (ModelConstructor<BaseModel>) and (new (...args: any[]) => (BaseModel & Searchable)), we would not have
             // to check if the result of the contructor (the model instance) is really a searchable.
-            if (!isSearchable(new entry.model())) {
+            if (!isSearchable(new entry.viewModel())) {
                 throw Error(
                     `Wrong configuration for ${
                         entry.collectionString
diff --git a/client/src/app/core/core-services/autoupdate.service.ts b/client/src/app/core/core-services/autoupdate.service.ts
index 09e2bd485..8873789d0 100644
--- a/client/src/app/core/core-services/autoupdate.service.ts
+++ b/client/src/app/core/core-services/autoupdate.service.ts
@@ -120,7 +120,6 @@ export class AutoupdateService extends OpenSlidesComponent {
                 await this.DS.add(this.mapObjectsToBaseModels(collection, autoupdate.changed[collection]));
             }
 
-            console.log('new max change id', autoupdate.to_change_id);
             await this.DS.flushToStorage(autoupdate.to_change_id);
         } else {
             // autoupdate fully in the future. we are missing something!
@@ -135,7 +134,7 @@ export class AutoupdateService extends OpenSlidesComponent {
      * @returns A list of basemodels constructed from the given models.
      */
     private mapObjectsToBaseModels(collection: string, models: object[]): BaseModel[] {
-        const targetClass = this.modelMapper.getModelConstructor(collection);
+        const targetClass = this.modelMapper.getModelConstructorFromCollectionString(collection);
         if (!targetClass) {
             throw new Error(`Unregistered resource ${collection}`);
         }
diff --git a/client/src/app/core/core-services/collectionStringMapper.service.ts b/client/src/app/core/core-services/collectionStringMapper.service.ts
index b69ae9110..81a348bd9 100644
--- a/client/src/app/core/core-services/collectionStringMapper.service.ts
+++ b/client/src/app/core/core-services/collectionStringMapper.service.ts
@@ -2,64 +2,134 @@ import { Injectable } from '@angular/core';
 
 import { ModelConstructor, BaseModel } from '../../shared/models/base/base-model';
 import { BaseRepository } from 'app/core/repositories/base-repository';
+import { ViewModelConstructor, BaseViewModel } from 'app/site/base/base-view-model';
 
 /**
- * Registeres the mapping of collection strings <--> actual types. Every Model should register itself here.
+ * Holds a mapping entry with the matching collection string,
+ * model constructor, view model constructor and the repository
+ */
+type MappingEntry = [
+    string,
+    ModelConstructor<BaseModel>,
+    ViewModelConstructor<BaseViewModel>,
+    BaseRepository<BaseViewModel, BaseModel>
+];
+
+/**
+ * Registeres the mapping between collection strings, models constructors, view
+ * model constructors and repositories.
+ * All models ned to be registered!
  */
 @Injectable({
     providedIn: 'root'
 })
 export class CollectionStringMapperService {
     /**
-     * Mapps collection strings to model constructors. Accessed by {@method registerCollectionElement} and
-     * {@method getCollectionStringType}.
+     * Maps collection strings to mapping entries
      */
-    private collectionStringsTypeMapping: {
-        [collectionString: string]: [ModelConstructor<BaseModel>, BaseRepository<any, any>];
+    private collectionStringMapping: {
+        [collectionString: string]: MappingEntry;
     } = {};
 
     /**
-     * Constructor to create the NotifyService. Registers itself to the WebsocketService.
-     * @param websocketService
+     * Maps models to mapping entries
      */
+    private modelMapping: {
+        [modelName: string]: MappingEntry;
+    } = {};
+
+    /**
+     * Maps view models to mapping entries
+     */
+    private viewModelMapping: {
+        [viewModelname: string]: MappingEntry;
+    } = {};
+
+    /**
+     * Maps repositories to mapping entries
+     */
+    private repositoryMapping: {
+        [repositoryName: string]: MappingEntry;
+    } = {};
+
     public constructor() {}
 
     /**
-     * Registers the type to the collection string
+     * Registers the combination of a collection string, model, view model and repository
      * @param collectionString
      * @param model
      */
-    public registerCollectionElement(
+    public registerCollectionElement<V extends BaseViewModel, M extends BaseModel>(
         collectionString: string,
-        model: ModelConstructor<BaseModel>,
-        repository: BaseRepository<any, any>
+        model: ModelConstructor<M>,
+        viewModel: ViewModelConstructor<V>,
+        repository: BaseRepository<V, M>
     ): void {
-        this.collectionStringsTypeMapping[collectionString] = [model, repository];
+        const entry: MappingEntry = [collectionString, model, viewModel, repository];
+        this.collectionStringMapping[collectionString] = entry;
+        this.modelMapping[model.name] = entry;
+        this.viewModelMapping[viewModel.name] = entry;
+        this.repositoryMapping[repository.name] = entry;
     }
 
-    /**
-     * Returns the constructor of the requested collection or undefined, if it is not registered.
-     * @param collectionString the requested collection
-     */
-    public getModelConstructor(collectionString: string): ModelConstructor<BaseModel> {
-        return this.collectionStringsTypeMapping[collectionString][0];
+    // The following accessors are for giving one of EntryType by given a different object
+    // of EntryType.
+
+    public getCollectionStringFromModelConstructor<M extends BaseModel>(ctor: ModelConstructor<M>): string {
+        return this.modelMapping[ctor.name][0];
+    }
+    public getCollectionStringFromViewModelConstructor<V extends BaseViewModel>(ctor: ViewModelConstructor<V>): string {
+        return this.viewModelMapping[ctor.name][0];
+    }
+    public getCollectionStringFromRepository<M extends BaseModel, V extends BaseViewModel>(
+        repository: BaseRepository<V, M>
+    ): string {
+        return this.repositoryMapping[repository.name][0];
     }
 
-    /**
-     * Returns the repository of the requested collection or undefined, if it is not registered.
-     * @param collectionString the requested collection
-     */
-    public getRepository(collectionString: string): BaseRepository<any, any> {
-        return this.collectionStringsTypeMapping[collectionString][1];
+    public getModelConstructorFromCollectionString<M extends BaseModel>(collectionString: string): ModelConstructor<M> {
+        return this.collectionStringMapping[collectionString][1] as ModelConstructor<M>;
+    }
+    public getModelConstructorFromViewModelConstructor<V extends BaseViewModel, M extends BaseModel>(
+        ctor: ViewModelConstructor<V>
+    ): ModelConstructor<M> {
+        return this.viewModelMapping[ctor.name][1] as ModelConstructor<M>;
+    }
+    public getModelConstructorFromRepository<V extends BaseViewModel, M extends BaseModel>(
+        repository: BaseRepository<V, M>
+    ): ModelConstructor<M> {
+        return this.repositoryMapping[repository.name][1] as ModelConstructor<M>;
     }
 
-    /**
-     * Returns the collection string of a given ModelConstructor or undefined, if it is not registered.
-     * @param ctor
-     */
-    public getCollectionString(ctor: ModelConstructor<BaseModel>): string {
-        return Object.keys(this.collectionStringsTypeMapping).find((collectionString: string) => {
-            return ctor === this.collectionStringsTypeMapping[collectionString][0];
-        });
+    public getViewModelConstructorFromCollectionString<M extends BaseViewModel>(
+        collectionString: string
+    ): ViewModelConstructor<M> {
+        return this.collectionStringMapping[collectionString][2] as ViewModelConstructor<M>;
+    }
+    public getViewModelConstructorFromModelConstructor<V extends BaseViewModel, M extends BaseModel>(
+        ctor: ModelConstructor<M>
+    ): ViewModelConstructor<V> {
+        return this.modelMapping[ctor.name][2] as ViewModelConstructor<V>;
+    }
+    public getViewModelConstructorFromRepository<V extends BaseViewModel, M extends BaseModel>(
+        repository: BaseRepository<V, M>
+    ): ViewModelConstructor<V> {
+        return this.repositoryMapping[repository.name][2] as ViewModelConstructor<V>;
+    }
+
+    public getRepositoryFromCollectionString<V extends BaseViewModel, M extends BaseModel>(
+        collectionString: string
+    ): BaseRepository<V, M> {
+        return this.collectionStringMapping[collectionString][3] as BaseRepository<V, M>;
+    }
+    public getRepositoryFromModelConstructor<V extends BaseViewModel, M extends BaseModel>(
+        ctor: ModelConstructor<M>
+    ): BaseRepository<V, M> {
+        return this.modelMapping[ctor.name][3] as BaseRepository<V, M>;
+    }
+    public getRepositoryFromViewModelConstructor<V extends BaseViewModel, M extends BaseModel>(
+        ctor: ViewModelConstructor<V>
+    ): BaseRepository<V, M> {
+        return this.viewModelMapping[ctor.name][3] as BaseRepository<V, M>;
     }
 }
diff --git a/client/src/app/core/core-services/data-store.service.ts b/client/src/app/core/core-services/data-store.service.ts
index f106700f6..895f0c1ab 100644
--- a/client/src/app/core/core-services/data-store.service.ts
+++ b/client/src/app/core/core-services/data-store.service.ts
@@ -72,6 +72,18 @@ export class DataStoreService {
      */
     private readonly changedSubject: Subject<BaseModel> = new Subject<BaseModel>();
 
+    /**
+     * This is subject notify all subscribers _before_ the `secondaryModelChangeSubject`.
+     * It's the same subject as the changedSubject.
+     */
+    public readonly primaryModelChangeSubject = new Subject<BaseModel>();
+
+    /**
+     * This is subject notify all subscribers _after_ the `primaryModelChangeSubject`.
+     * It's the same subject as the changedSubject.
+     */
+    public readonly secondaryModelChangeSubject = new Subject<BaseModel>();
+
     /**
      * Observe the datastore for changes.
      *
@@ -127,7 +139,12 @@ export class DataStoreService {
      * @param storageService use StorageService to preserve the DataStore.
      * @param modelMapper
      */
-    public constructor(private storageService: StorageService, private modelMapper: CollectionStringMapperService) {}
+    public constructor(private storageService: StorageService, private modelMapper: CollectionStringMapperService) {
+        this.changeObservable.subscribe(model => {
+            this.primaryModelChangeSubject.next(model);
+            this.secondaryModelChangeSubject.next(model);
+        });
+    }
 
     /**
      * Gets the DataStore from cache and instantiate all models out of the serialized version.
@@ -170,7 +187,7 @@ export class DataStoreService {
         const storage: ModelStorage = {};
         Object.keys(serializedStore).forEach(collectionString => {
             storage[collectionString] = {} as ModelCollection;
-            const target = this.modelMapper.getModelConstructor(collectionString);
+            const target = this.modelMapper.getModelConstructorFromCollectionString(collectionString);
             if (target) {
                 Object.keys(serializedStore[collectionString]).forEach(id => {
                     const data = JSON.parse(serializedStore[collectionString][id]);
@@ -201,7 +218,7 @@ export class DataStoreService {
         if (typeof collectionType === 'string') {
             return collectionType;
         } else {
-            return this.modelMapper.getCollectionString(collectionType);
+            return this.modelMapper.getCollectionStringFromModelConstructor(collectionType);
         }
     }
 
diff --git a/client/src/app/core/core-services/operator.service.ts b/client/src/app/core/core-services/operator.service.ts
index fbefe381c..132a852fc 100644
--- a/client/src/app/core/core-services/operator.service.ts
+++ b/client/src/app/core/core-services/operator.service.ts
@@ -9,6 +9,10 @@ import { User } from '../../shared/models/users/user';
 import { environment } from 'environments/environment';
 import { DataStoreService } from './data-store.service';
 import { OfflineService } from './offline.service';
+import { ViewUser } from 'app/site/users/models/view-user';
+import { CollectionStringMapperService } from './collectionStringMapper.service';
+import { OnAfterAppsLoaded } from '../onAfterAppsLoaded';
+import { UserRepositoryService } from '../repositories/users/user-repository.service';
 
 /**
  * Permissions on the client are just strings. This makes clear, that
@@ -36,12 +40,19 @@ export interface WhoAmIResponse {
 @Injectable({
     providedIn: 'root'
 })
-export class OperatorService extends OpenSlidesComponent {
+export class OperatorService extends OpenSlidesComponent implements OnAfterAppsLoaded {
     /**
      * The operator.
      */
     private _user: User;
 
+    /**
+     * The operator as a view user. We need a separation here, because
+     * we need to acces the operators permissions, before we get data
+     * from the server to build the view user.
+     */
+    private _viewUser: ViewUser;
+
     /**
      * Get the user that corresponds to operator.
      */
@@ -49,14 +60,20 @@ export class OperatorService extends OpenSlidesComponent {
         return this._user;
     }
 
+    /**
+     * Get the user that corresponds to operator.
+     */
+    public get viewUser(): ViewUser {
+        return this._viewUser;
+    }
+
     /**
      * Sets the current operator.
      *
      * The permissions are updated and the new user published.
      */
     public set user(user: User) {
-        this._user = user;
-        this.updatePermissions();
+        this.updateUser(user);
     }
 
     public get isAnonymous(): boolean {
@@ -78,6 +95,16 @@ export class OperatorService extends OpenSlidesComponent {
      */
     private operatorSubject: BehaviorSubject<User> = new BehaviorSubject<User>(null);
 
+    /**
+     * Subject for the operator as a view user.
+     */
+    private viewOperatorSubject: BehaviorSubject<ViewUser> = new BehaviorSubject<ViewUser>(null);
+
+    /**
+     * The user repository. Will be filled by the `onAfterAppsLoaded`.
+     */
+    private userRepository: UserRepositoryService;
+
     /**
      * Sets up an observer for watching changes in the DS. If the operator user or groups are changed,
      * the operator's permissions are updated.
@@ -86,7 +113,12 @@ export class OperatorService extends OpenSlidesComponent {
      * @param DS
      * @param offlineService
      */
-    public constructor(private http: HttpClient, private DS: DataStoreService, private offlineService: OfflineService) {
+    public constructor(
+        private http: HttpClient,
+        private DS: DataStoreService,
+        private offlineService: OfflineService,
+        private collectionStringMapperService: CollectionStringMapperService
+    ) {
         super();
 
         this.DS.changeObservable.subscribe(newModel => {
@@ -96,8 +128,7 @@ export class OperatorService extends OpenSlidesComponent {
                 }
 
                 if (newModel instanceof User && this._user.id === newModel.id) {
-                    this._user = newModel;
-                    this.updatePermissions();
+                    this.updateUser(newModel);
                 }
             } else if (newModel instanceof Group && newModel.id === 1) {
                 // Group 1 (default) for anonymous changed
@@ -106,6 +137,33 @@ export class OperatorService extends OpenSlidesComponent {
         });
     }
 
+    /**
+     * Load the repo to get a view user.
+     */
+    public onAfterAppsLoaded(): void {
+        this.userRepository = this.collectionStringMapperService.getRepositoryFromModelConstructor(
+            User
+        ) as UserRepositoryService;
+        if (this.user) {
+            this._viewUser = this.userRepository.getViewModel(this.user.id);
+        }
+    }
+
+    /**
+     * Updates the user and update the permissions.
+     *
+     * @param user The user to set.
+     */
+    private updateUser(user: User | null): void {
+        this._user = user;
+        if (user && this.userRepository) {
+            this._viewUser = this.userRepository.getViewModel(user.id);
+        } else {
+            this._viewUser = null;
+        }
+        this.updatePermissions();
+    }
+
     /**
      * Calls `/apps/users/whoami` to find out the real operator.
      * @returns The response of the WhoAmI request.
@@ -131,10 +189,14 @@ export class OperatorService extends OpenSlidesComponent {
      * Services an components can use it to get informed when something changes in
      * the operator
      */
-    public getObservable(): Observable<User> {
+    public getUserObservable(): Observable<User> {
         return this.operatorSubject.asObservable();
     }
 
+    public getViewUserObservable(): Observable<ViewUser> {
+        return this.viewOperatorSubject.asObservable();
+    }
+
     /**
      * Checks, if the operator has at least one of the given permissions.
      * @param checkPerms The permissions to check, if at least one matches.
@@ -193,5 +255,6 @@ export class OperatorService extends OpenSlidesComponent {
         }
         // publish changes in the operator.
         this.operatorSubject.next(this.user);
+        this.viewOperatorSubject.next(this.viewUser);
     }
 }
diff --git a/client/src/app/core/core-services/projector.service.ts b/client/src/app/core/core-services/projector.service.ts
index 6926cc35a..b98a5e096 100644
--- a/client/src/app/core/core-services/projector.service.ts
+++ b/client/src/app/core/core-services/projector.service.ts
@@ -17,6 +17,8 @@ import {
 import { HttpService } from './http.service';
 import { SlideManager } from 'app/slides/services/slide-manager.service';
 import { BaseModel } from 'app/shared/models/base/base-model';
+import { BaseViewModel } from 'app/site/base/base-view-model';
+import { ViewModelStoreService } from './view-model-store.service';
 
 /**
  * This service cares about Projectables being projected and manage all projection-related
@@ -34,7 +36,12 @@ export class ProjectorService extends OpenSlidesComponent {
      * @param DS
      * @param dataSend
      */
-    public constructor(private DS: DataStoreService, private http: HttpService, private slideManager: SlideManager) {
+    public constructor(
+        private DS: DataStoreService,
+        private http: HttpService,
+        private slideManager: SlideManager,
+        private viewModelStore: ViewModelStoreService
+    ) {
         super();
     }
 
@@ -222,13 +229,12 @@ export class ProjectorService extends OpenSlidesComponent {
     }
 
     /**
-     * Returns a model associated with the identifiable projector element. Throws an error,
-     * if the element is not mappable.
+     * Asserts, that the given element is mappable to a model or view model.
+     * Throws an error, if this assertion fails.
      *
-     * @param element The projector element
-     * @returns the model from the projector element
+     * @param element The element to check
      */
-    public getModelFromProjectorElement<T extends BaseModel>(element: IdentifiableProjectorElement): T {
+    private assertElementIsMappable(element: IdentifiableProjectorElement): void {
         if (!this.slideManager.canSlideBeMappedToModel(element.name)) {
             throw new Error('This projector element cannot be mapped to a model');
         }
@@ -236,9 +242,32 @@ export class ProjectorService extends OpenSlidesComponent {
         if (!identifiers.includes('name') || !identifiers.includes('id')) {
             throw new Error('To map this element to a model, a name and id is needed.');
         }
+    }
+
+    /**
+     * Returns a model associated with the identifiable projector element. Throws an error,
+     * if the element is not mappable.
+     *
+     * @param element The projector element
+     * @returns the model from the projector element
+     */
+    public getModelFromProjectorElement<T extends BaseModel>(element: IdentifiableProjectorElement): T {
+        this.assertElementIsMappable(element);
         return this.DS.get<T>(element.name, element.id);
     }
 
+    /**
+     * Returns a view model associated with the identifiable projector element. Throws an error,
+     * if the element is not mappable.
+     *
+     * @param element The projector element
+     * @returns the view model from the projector element
+     */
+    public getViewModelFromProjectorElement<T extends BaseViewModel>(element: IdentifiableProjectorElement): T {
+        this.assertElementIsMappable(element);
+        return this.viewModelStore.get<T>(element.name, element.id);
+    }
+
     /**
      * Projects the next slide in the queue. Moves all currently projected
      * non-stable slides to the history.
diff --git a/client/src/app/core/core-services/time-travel.service.ts b/client/src/app/core/core-services/time-travel.service.ts
index e36e155c7..86de9a804 100644
--- a/client/src/app/core/core-services/time-travel.service.ts
+++ b/client/src/app/core/core-services/time-travel.service.ts
@@ -68,7 +68,7 @@ export class TimeTravelService {
             [collectionString, id] = historyObject.element_id.split(':');
 
             if (historyObject.full_data) {
-                const targetClass = this.modelMapperService.getModelConstructor(collectionString);
+                const targetClass = this.modelMapperService.getModelConstructorFromCollectionString(collectionString);
                 await this.DS.add([new targetClass(historyObject.full_data)]);
             } else {
                 await this.DS.remove(collectionString, [+id]);
diff --git a/client/src/app/core/core-services/view-model-store.service.spec.ts b/client/src/app/core/core-services/view-model-store.service.spec.ts
new file mode 100644
index 000000000..73284ca13
--- /dev/null
+++ b/client/src/app/core/core-services/view-model-store.service.spec.ts
@@ -0,0 +1,15 @@
+import { TestBed, inject } from '@angular/core/testing';
+import { ViewModelStoreService } from './view-model-store.service';
+import { E2EImportsModule } from '../../../e2e-imports.module';
+
+describe('ViewModelStoreService', () => {
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [E2EImportsModule],
+            providers: [ViewModelStoreService]
+        });
+    });
+    it('should be created', inject([ViewModelStoreService], (service: ViewModelStoreService) => {
+        expect(service).toBeTruthy();
+    }));
+});
diff --git a/client/src/app/core/core-services/view-model-store.service.ts b/client/src/app/core/core-services/view-model-store.service.ts
new file mode 100644
index 000000000..941aafbf2
--- /dev/null
+++ b/client/src/app/core/core-services/view-model-store.service.ts
@@ -0,0 +1,90 @@
+import { Injectable } from '@angular/core';
+import { CollectionStringMapperService } from './collectionStringMapper.service';
+import { BaseViewModel, ViewModelConstructor } from 'app/site/base/base-view-model';
+import { BaseRepository } from '../repositories/base-repository';
+
+/**
+ * This service takes care of handling view models.
+ */
+@Injectable({
+    providedIn: 'root'
+})
+export class ViewModelStoreService {
+    /**
+     * @param mapperService
+     */
+    public constructor(private mapperService: CollectionStringMapperService) {}
+
+    /**
+     * gets the repository from a collection string or a view model constructor.
+     *
+     * @param collectionType The collection string or constructor.
+     */
+    private getRepository<T extends BaseViewModel>(
+        collectionType: ViewModelConstructor<T> | string
+    ): BaseRepository<T, any> {
+        if (typeof collectionType === 'string') {
+            return this.mapperService.getRepositoryFromCollectionString(collectionType) as BaseRepository<T, any>;
+        } else {
+            return this.mapperService.getRepositoryFromViewModelConstructor(collectionType as ViewModelConstructor<T>);
+        }
+    }
+
+    /**
+     * Returns the view model identified by the collectionString and id
+     *
+     * @param collectionString The collection of the view model
+     * @param id The id of the view model
+     */
+    public get<T extends BaseViewModel>(collectionType: ViewModelConstructor<T> | string, id: number): T {
+        return this.getRepository(collectionType).getViewModel(id);
+    }
+
+    /**
+     * Returns all view models for the given ids.
+     *
+     * @param collectionType The collection of the view model
+     * @param ids All ids to match
+     */
+    public getMany<T extends BaseViewModel>(collectionType: ViewModelConstructor<T> | string, ids: number[]): T[] {
+        const repository = this.getRepository<T>(collectionType);
+
+        return ids
+            .map(id => {
+                return repository.getViewModel(id);
+            })
+            .filter(model => !!model); // remove non valid models.
+    }
+
+    /**
+     * Gets all view models from a collection
+     *
+     * @param collectionString  The collection
+     * @returns all models from the collection
+     */
+    public getAll<T extends BaseViewModel>(collectionType: ViewModelConstructor<T> | string): T[] {
+        return this.getRepository(collectionType).getViewModelList();
+    }
+
+    /**
+     * Get all view modles from a collection, that satisfy the callback
+     *
+     * @param collectionString The collection
+     * @param callback The function to check
+     * @returns all matched view models of the collection
+     */
+    public filter<T extends BaseViewModel>(collectionString: string, callback: (model: T) => boolean): T[] {
+        return this.getAll<T>(collectionString).filter(callback);
+    }
+
+    /**
+     * Finds one view model from the collection, that satifies the callback
+     *
+     * @param collectionString The collection
+     * @param callback THe callback to satisfy
+     * @returns a found view model or null, if nothing was found.
+     */
+    public find<T extends BaseViewModel>(collectionString: string, callback: (model: T) => boolean): T {
+        return this.getAll<T>(collectionString).find(callback);
+    }
+}
diff --git a/client/src/app/core/core.module.ts b/client/src/app/core/core.module.ts
index f7d2e7da1..f3fbf837a 100644
--- a/client/src/app/core/core.module.ts
+++ b/client/src/app/core/core.module.ts
@@ -1,4 +1,4 @@
-import { NgModule, Optional, SkipSelf } from '@angular/core';
+import { NgModule, Optional, SkipSelf, Type } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { Title } from '@angular/platform-browser';
 
@@ -6,6 +6,10 @@ import { Title } from '@angular/platform-browser';
 import { PromptDialogComponent } from '../shared/components/prompt-dialog/prompt-dialog.component';
 import { ChoiceDialogComponent } from '../shared/components/choice-dialog/choice-dialog.component';
 import { ProjectionDialogComponent } from 'app/shared/components/projection-dialog/projection-dialog.component';
+import { OperatorService } from './core-services/operator.service';
+import { OnAfterAppsLoaded } from './onAfterAppsLoaded';
+
+export const ServicesToLoadOnAppsLoaded: Type<OnAfterAppsLoaded>[] = [OperatorService];
 
 /**
  * Global Core Module.
diff --git a/client/src/app/core/onAfterAppsLoaded.ts b/client/src/app/core/onAfterAppsLoaded.ts
new file mode 100644
index 000000000..4ce74d849
--- /dev/null
+++ b/client/src/app/core/onAfterAppsLoaded.ts
@@ -0,0 +1,9 @@
+/**
+ * A lifecyclehook to be called, after all apps are loaded.
+ */
+export interface OnAfterAppsLoaded {
+    /**
+     * The hook to call
+     */
+    onAfterAppsLoaded(): void;
+}
diff --git a/client/src/app/core/repositories/agenda/agenda-repository.service.spec.ts b/client/src/app/core/repositories/agenda/item-repository.service.spec.ts
similarity index 52%
rename from client/src/app/core/repositories/agenda/agenda-repository.service.spec.ts
rename to client/src/app/core/repositories/agenda/item-repository.service.spec.ts
index ab4c893ae..7b99f19d3 100644
--- a/client/src/app/core/repositories/agenda/agenda-repository.service.spec.ts
+++ b/client/src/app/core/repositories/agenda/item-repository.service.spec.ts
@@ -1,17 +1,17 @@
 import { TestBed, inject } from '@angular/core/testing';
 
-import { AgendaRepositoryService } from './agenda-repository.service';
+import { ItemRepositoryService } from './item-repository.service';
 import { E2EImportsModule } from 'e2e-imports.module';
 
-describe('AgendaRepositoryService', () => {
+describe('ItemRepositoryService', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [E2EImportsModule],
-            providers: [AgendaRepositoryService]
+            providers: [ItemRepositoryService]
         });
     });
 
-    it('should be created', inject([AgendaRepositoryService], (service: AgendaRepositoryService) => {
+    it('should be created', inject([ItemRepositoryService], (service: ItemRepositoryService) => {
         expect(service).toBeTruthy();
     }));
 });
diff --git a/client/src/app/core/repositories/agenda/agenda-repository.service.ts b/client/src/app/core/repositories/agenda/item-repository.service.ts
similarity index 91%
rename from client/src/app/core/repositories/agenda/agenda-repository.service.ts
rename to client/src/app/core/repositories/agenda/item-repository.service.ts
index d448c6f15..bb477ca69 100644
--- a/client/src/app/core/repositories/agenda/agenda-repository.service.ts
+++ b/client/src/app/core/repositories/agenda/item-repository.service.ts
@@ -3,8 +3,6 @@ import { tap, map } from 'rxjs/operators';
 import { Observable } from 'rxjs';
 
 import { BaseRepository } from '../base-repository';
-import { AgendaBaseModel } from 'app/shared/models/base/agenda-base-model';
-import { BaseModel } from 'app/shared/models/base/base-model';
 import { CollectionStringMapperService } from '../../core-services/collectionStringMapper.service';
 import { ConfigService } from 'app/core/ui-services/config.service';
 import { DataSendService } from 'app/core/core-services/data-send.service';
@@ -14,10 +12,13 @@ import { Identifiable } from 'app/shared/models/base/identifiable';
 import { Item } from 'app/shared/models/agenda/item';
 import { OSTreeSortEvent } from 'app/shared/components/sorting-tree/sorting-tree.component';
 import { Speaker } from 'app/shared/models/agenda/speaker';
-import { User } from 'app/shared/models/users/user';
 import { ViewItem } from 'app/site/agenda/models/view-item';
 import { ViewSpeaker } from 'app/site/agenda/models/view-speaker';
 import { TreeService } from 'app/core/ui-services/tree.service';
+import { BaseAgendaViewModel } from 'app/site/base/base-agenda-view-model';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
+import { BaseViewModel } from 'app/site/base/base-view-model';
+import { ViewUser } from 'app/site/users/models/view-user';
 
 /**
  * Repository service for users
@@ -27,7 +28,7 @@ import { TreeService } from 'app/core/ui-services/tree.service';
 @Injectable({
     providedIn: 'root'
 })
-export class AgendaRepositoryService extends BaseRepository<ViewItem, Item> {
+export class ItemRepositoryService extends BaseRepository<ViewItem, Item> {
     /**
      * Contructor for agenda repository.
      *
@@ -39,38 +40,39 @@ export class AgendaRepositoryService extends BaseRepository<ViewItem, Item> {
      * @param treeService sort the data according to weight and parents
      */
     public constructor(
-        protected DS: DataStoreService,
-        private httpService: HttpService,
+        DS: DataStoreService,
         mapperService: CollectionStringMapperService,
+        viewModelStoreService: ViewModelStoreService,
+        private httpService: HttpService,
         private config: ConfigService,
         private dataSend: DataSendService,
         private treeService: TreeService
     ) {
-        super(DS, mapperService, Item);
+        super(DS, mapperService, viewModelStoreService, Item);
     }
 
     /**
-     * Returns the corresponding content object to a given {@link Item} as an {@link AgendaBaseModel}
+     * Returns the corresponding content object to a given {@link Item} as an {@link AgendaBaseViewModel}
      * Used dynamically because of heavy race conditions
      *
      * @param agendaItem the target agenda Item
      * @returns the content object of the given item. Might be null if it was not found.
      */
-    public getContentObject(agendaItem: Item): AgendaBaseModel {
-        const contentObject = this.DS.get<BaseModel>(
+    public getContentObject(agendaItem: Item): BaseAgendaViewModel {
+        const contentObject = this.viewModelStoreService.get<BaseViewModel>(
             agendaItem.content_object.collection,
             agendaItem.content_object.id
         );
         if (!contentObject) {
             return null;
         }
-        if (contentObject instanceof AgendaBaseModel) {
-            return contentObject as AgendaBaseModel;
+        if (contentObject instanceof BaseAgendaViewModel) {
+            return contentObject as BaseAgendaViewModel;
         } else {
             throw new Error(
                 `The content object (${agendaItem.content_object.collection}, ${
                     agendaItem.content_object.id
-                }) of item ${agendaItem.id} is not a AgendaBaseModel.`
+                }) of item ${agendaItem.id} is not a AgendaBaseViewModel.`
             );
         }
     }
@@ -86,7 +88,7 @@ export class AgendaRepositoryService extends BaseRepository<ViewItem, Item> {
         const speakers = item.speakers;
         if (speakers && speakers.length > 0) {
             speakers.forEach((speaker: Speaker) => {
-                const user = this.DS.get(User, speaker.user_id);
+                const user = this.viewModelStoreService.get(ViewUser, speaker.user_id);
                 viewSpeakers.push(new ViewSpeaker(speaker, user));
             });
         }
diff --git a/client/src/app/core/repositories/agenda/topic-repository.service.ts b/client/src/app/core/repositories/agenda/topic-repository.service.ts
index 3281d0a5f..8e4e3d83d 100644
--- a/client/src/app/core/repositories/agenda/topic-repository.service.ts
+++ b/client/src/app/core/repositories/agenda/topic-repository.service.ts
@@ -10,6 +10,9 @@ import { ViewTopic } from 'app/site/agenda/models/view-topic';
 import { Identifiable } from 'app/shared/models/base/identifiable';
 import { CollectionStringMapperService } from 'app/core/core-services/collectionStringMapper.service';
 import { CreateTopic } from 'app/site/agenda/models/create-topic';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
+import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile';
+import { ViewItem } from 'app/site/agenda/models/view-item';
 
 /**
  * Repository for topics
@@ -28,9 +31,10 @@ export class TopicRepositoryService extends BaseRepository<ViewTopic, Topic> {
     public constructor(
         DS: DataStoreService,
         mapperService: CollectionStringMapperService,
+        viewModelStoreService: ViewModelStoreService,
         private dataSend: DataSendService
     ) {
-        super(DS, mapperService, Topic, [Mediafile, Item]);
+        super(DS, mapperService, viewModelStoreService, Topic, [Mediafile, Item]);
     }
 
     /**
@@ -40,22 +44,11 @@ export class TopicRepositoryService extends BaseRepository<ViewTopic, Topic> {
      * @returns a new view topic
      */
     public createViewModel(topic: Topic): ViewTopic {
-        const attachments = this.DS.getMany(Mediafile, topic.attachments_id);
-        const item = this.getAgendaItem(topic);
+        const attachments = this.viewModelStoreService.getMany(ViewMediafile, topic.attachments_id);
+        const item = this.viewModelStoreService.get(ViewItem, topic.agenda_item_id);
         return new ViewTopic(topic, attachments, item);
     }
 
-    /**
-     * Gets the corresponding agendaItem to the topic.
-     * Used to deal with race conditions
-     *
-     * @param topic the topic for the agenda item
-     * @returns an agenda item that fits for the topic
-     */
-    public getAgendaItem(topic: Topic): Item {
-        return this.DS.get(Item, topic.agenda_item_id);
-    }
-
     /**
      * Save a new topic
      *
diff --git a/client/src/app/core/repositories/assignments/assignment-repository.service.ts b/client/src/app/core/repositories/assignments/assignment-repository.service.ts
index 206262706..07a29da2b 100644
--- a/client/src/app/core/repositories/assignments/assignment-repository.service.ts
+++ b/client/src/app/core/repositories/assignments/assignment-repository.service.ts
@@ -8,6 +8,10 @@ import { BaseRepository } from '../base-repository';
 import { DataStoreService } from '../../core-services/data-store.service';
 import { Identifiable } from 'app/shared/models/base/identifiable';
 import { CollectionStringMapperService } from '../../core-services/collectionStringMapper.service';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
+import { ViewItem } from 'app/site/agenda/models/view-item';
+import { ViewUser } from 'app/site/users/models/view-user';
+import { ViewTag } from 'app/site/tags/models/view-tag';
 
 /**
  * Repository Service for Assignments.
@@ -24,8 +28,12 @@ export class AssignmentRepositoryService extends BaseRepository<ViewAssignment,
      * @param DS The DataStore
      * @param mapperService Maps collection strings to classes
      */
-    public constructor(DS: DataStoreService, mapperService: CollectionStringMapperService) {
-        super(DS, mapperService, Assignment, [User, Item, Tag]);
+    public constructor(
+        DS: DataStoreService,
+        mapperService: CollectionStringMapperService,
+        viewModelStoreService: ViewModelStoreService
+    ) {
+        super(DS, mapperService, viewModelStoreService, Assignment, [User, Item, Tag]);
     }
 
     public async update(assignment: Partial<Assignment>, viewAssignment: ViewAssignment): Promise<void> {
@@ -41,9 +49,9 @@ export class AssignmentRepositoryService extends BaseRepository<ViewAssignment,
     }
 
     public createViewModel(assignment: Assignment): ViewAssignment {
-        const relatedUser = this.DS.getMany(User, assignment.candidateIds);
-        const agendaItem = this.DS.get(Item, assignment.agenda_item_id);
-        const tags = this.DS.getMany(Tag, assignment.tags_id);
+        const relatedUser = this.viewModelStoreService.getMany(ViewUser, assignment.candidateIds);
+        const agendaItem = this.viewModelStoreService.get(ViewItem, assignment.agenda_item_id);
+        const tags = this.viewModelStoreService.getMany(ViewTag, assignment.tags_id);
 
         return new ViewAssignment(assignment, relatedUser, agendaItem, tags);
     }
diff --git a/client/src/app/core/repositories/base-repository.ts b/client/src/app/core/repositories/base-repository.ts
index d74e41ab8..fe5279bf2 100644
--- a/client/src/app/core/repositories/base-repository.ts
+++ b/client/src/app/core/repositories/base-repository.ts
@@ -7,8 +7,11 @@ import { CollectionStringMapperService } from '../core-services/collectionString
 import { DataStoreService } from '../core-services/data-store.service';
 import { Identifiable } from '../../shared/models/base/identifiable';
 import { auditTime } from 'rxjs/operators';
+import { ViewModelStoreService } from '../core-services/view-model-store.service';
+import { OnAfterAppsLoaded } from '../onAfterAppsLoaded';
 
-export abstract class BaseRepository<V extends BaseViewModel, M extends BaseModel> extends OpenSlidesComponent {
+export abstract class BaseRepository<V extends BaseViewModel, M extends BaseModel> extends OpenSlidesComponent
+    implements OnAfterAppsLoaded {
     /**
      * Stores all the viewModel in an object
      */
@@ -29,26 +32,33 @@ export abstract class BaseRepository<V extends BaseViewModel, M extends BaseMode
      */
     protected readonly generalViewModelSubject: Subject<V> = new Subject<V>();
 
+    private _name: string;
+
+    public get name(): string {
+        return this._name;
+    }
+
     /**
      * Construction routine for the base repository
      *
      * @param DS: The DataStore
-     * @param collectionStringModelMapperService Mapping strings to their corresponding classes
+     * @param collectionStringMapperService Mapping strings to their corresponding classes
      * @param baseModelCtor The model constructor of which this repository is about.
      * @param depsModelCtors A list of constructors that are used in the view model.
      * If one of those changes, the view models will be updated.
      */
     public constructor(
         protected DS: DataStoreService,
-        protected collectionStringModelMapperService: CollectionStringMapperService,
+        protected collectionStringMapperService: CollectionStringMapperService,
+        protected viewModelStoreService: ViewModelStoreService,
         protected baseModelCtor: ModelConstructor<M>,
         protected depsModelCtors?: ModelConstructor<BaseModel>[]
     ) {
         super();
-        this.setup();
+        this._name = baseModelCtor.name;
     }
 
-    protected setup(): void {
+    public onAfterAppsLoaded(): void {
         // Populate the local viewModelStore with ViewModel Objects.
         this.DS.getAll(this.baseModelCtor).forEach((model: M) => {
             this.viewModelStore[model.id] = this.createViewModel(model);
@@ -60,28 +70,40 @@ export abstract class BaseRepository<V extends BaseViewModel, M extends BaseMode
         });
 
         // Could be raise in error if the root injector is not known
-        this.DS.changeObservable.subscribe(model => {
+        this.DS.primaryModelChangeSubject.subscribe(model => {
             if (model instanceof this.baseModelCtor) {
                 // Add new and updated motions to the viewModelStore
                 this.viewModelStore[model.id] = this.createViewModel(model as M);
                 this.updateAllObservables(model.id);
-            } else if (this.depsModelCtors) {
+            }
+        });
+
+        if (this.depsModelCtors) {
+            this.DS.secondaryModelChangeSubject.subscribe(model => {
                 const dependencyChanged: boolean = this.depsModelCtors.some(ctor => {
                     return model instanceof ctor;
                 });
                 if (dependencyChanged) {
+                    const viewModel = this.viewModelStoreService.get(model.collectionString, model.id);
+
                     // if an domain object we need was added or changed, update viewModelStore
-                    this.getViewModelList().forEach(viewModel => {
-                        viewModel.updateValues(model);
+                    this.getViewModelList().forEach(ownViewModel => {
+                        ownViewModel.updateDependencies(viewModel);
                     });
                     this.updateAllObservables(model.id);
                 }
-            }
-        });
+            });
+        }
 
         // Watch the Observables for deleting
+        // TODO: What happens, if some related object was deleted?
+        // My quess: This must trigger an autoupdate also for this model, because some IDs changed, so the
+        // affected models will be newly created by the primaryModelChangeSubject.
         this.DS.deletedObservable.subscribe(model => {
-            if (model.collection === this.collectionStringModelMapperService.getCollectionString(this.baseModelCtor)) {
+            if (
+                model.collection ===
+                this.collectionStringMapperService.getCollectionStringFromModelConstructor(this.baseModelCtor)
+            ) {
                 delete this.viewModelStore[model.id];
                 this.updateAllObservables(model.id);
             }
@@ -167,8 +189,8 @@ export abstract class BaseRepository<V extends BaseViewModel, M extends BaseMode
     protected updateViewModelObservable(id: number): void {
         if (this.viewModelSubjects[id]) {
             this.viewModelSubjects[id].next(this.viewModelStore[id]);
+            this.generalViewModelSubject.next(this.viewModelStore[id]);
         }
-        this.generalViewModelSubject.next(this.viewModelStore[id]);
     }
 
     /**
diff --git a/client/src/app/core/repositories/common/chatmessage-repository.service.ts b/client/src/app/core/repositories/common/chatmessage-repository.service.ts
index ecd54f40f..405b1eae1 100644
--- a/client/src/app/core/repositories/common/chatmessage-repository.service.ts
+++ b/client/src/app/core/repositories/common/chatmessage-repository.service.ts
@@ -5,13 +5,18 @@ import { Identifiable } from 'app/shared/models/base/identifiable';
 import { CollectionStringMapperService } from '../../core-services/collectionStringMapper.service';
 import { ChatMessage } from 'app/shared/models/core/chat-message';
 import { ViewChatMessage } from 'app/site/common/models/view-chatmessage';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
 
 @Injectable({
     providedIn: 'root'
 })
 export class ChatMessageRepositoryService extends BaseRepository<ViewChatMessage, ChatMessage> {
-    public constructor(DS: DataStoreService, mapperService: CollectionStringMapperService) {
-        super(DS, mapperService, ChatMessage);
+    public constructor(
+        DS: DataStoreService,
+        mapperService: CollectionStringMapperService,
+        viewModelStoreService: ViewModelStoreService
+    ) {
+        super(DS, mapperService, viewModelStoreService, ChatMessage);
     }
 
     protected createViewModel(message: ChatMessage): ViewChatMessage {
diff --git a/client/src/app/site/config/services/config-repository.service.spec.ts b/client/src/app/core/repositories/config/config-repository.service.spec.ts
similarity index 100%
rename from client/src/app/site/config/services/config-repository.service.spec.ts
rename to client/src/app/core/repositories/config/config-repository.service.spec.ts
diff --git a/client/src/app/site/config/services/config-repository.service.ts b/client/src/app/core/repositories/config/config-repository.service.ts
similarity index 96%
rename from client/src/app/site/config/services/config-repository.service.ts
rename to client/src/app/core/repositories/config/config-repository.service.ts
index 2efa7308e..9fb892ddd 100644
--- a/client/src/app/site/config/services/config-repository.service.ts
+++ b/client/src/app/core/repositories/config/config-repository.service.ts
@@ -1,14 +1,16 @@
 import { Injectable } from '@angular/core';
 
-import { BaseRepository } from 'app/core/repositories/base-repository';
-import { ViewConfig } from '../models/view-config';
-import { Config } from 'app/shared/models/core/config';
 import { Observable, BehaviorSubject } from 'rxjs';
+
+import { BaseRepository } from 'app/core/repositories/base-repository';
+import { Config } from 'app/shared/models/core/config';
 import { DataStoreService } from 'app/core/core-services/data-store.service';
 import { ConstantsService } from 'app/core/ui-services/constants.service';
 import { HttpService } from 'app/core/core-services/http.service';
 import { Identifiable } from 'app/shared/models/base/identifiable';
 import { CollectionStringMapperService } from 'app/core/core-services/collectionStringMapper.service';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
+import { ViewConfig } from 'app/site/config/models/view-config';
 
 /**
  * Holds a single config item.
@@ -95,10 +97,11 @@ export class ConfigRepositoryService extends BaseRepository<ViewConfig, Config>
     public constructor(
         DS: DataStoreService,
         mapperService: CollectionStringMapperService,
+        viewModelStoreService: ViewModelStoreService,
         private constantsService: ConstantsService,
         private http: HttpService
     ) {
-        super(DS, mapperService, Config);
+        super(DS, mapperService, viewModelStoreService, Config);
 
         this.constantsService.get('OpenSlidesConfigVariables').subscribe(constant => {
             this.createConfigStructure(constant);
@@ -111,7 +114,7 @@ export class ConfigRepositoryService extends BaseRepository<ViewConfig, Config>
      * Overwritten setup. Does only care about the custom list observable and inserts changed configs into the
      * config group structure.
      */
-    protected setup(): void {
+    public onAfterAppsLoaded(): void {
         if (!this.configListSubject) {
             this.configListSubject = new BehaviorSubject<ConfigGroup[]>(null);
         }
diff --git a/client/src/app/core/repositories/history/history-repository.service.ts b/client/src/app/core/repositories/history/history-repository.service.ts
index ba35245f2..b3c0f2aa9 100644
--- a/client/src/app/core/repositories/history/history-repository.service.ts
+++ b/client/src/app/core/repositories/history/history-repository.service.ts
@@ -9,7 +9,8 @@ import { Identifiable } from 'app/shared/models/base/identifiable';
 import { HttpService } from 'app/core/core-services/http.service';
 import { ViewHistory } from 'app/site/history/models/view-history';
 import { TimeTravelService } from 'app/core/core-services/time-travel.service';
-import { BaseModel } from 'app/shared/models/base/base-model';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
+import { ViewUser } from 'app/site/users/models/view-user';
 
 /**
  * Repository for the history.
@@ -31,10 +32,11 @@ export class HistoryRepositoryService extends BaseRepository<ViewHistory, Histor
     public constructor(
         DS: DataStoreService,
         mapperService: CollectionStringMapperService,
+        viewModelStoreService: ViewModelStoreService,
         private httpService: HttpService,
         private timeTravel: TimeTravelService
     ) {
-        super(DS, mapperService, History, [User]);
+        super(DS, mapperService, viewModelStoreService, History, [User]);
     }
 
     /**
@@ -70,12 +72,11 @@ export class HistoryRepositoryService extends BaseRepository<ViewHistory, Histor
      * @returns the ListTitle or null if the model was deleted already
      */
     public getOldModelInfo(collectionString: string, id: number): string {
-        const oldModel: BaseModel = this.DS.get(collectionString, id);
-        if (oldModel) {
-            return oldModel.getListTitle();
-        } else {
-            return null;
+        const model = this.viewModelStoreService.get(collectionString, id);
+        if (model) {
+            return model.getListTitle();
         }
+        return null;
     }
 
     /**
@@ -85,7 +86,7 @@ export class HistoryRepositoryService extends BaseRepository<ViewHistory, Histor
      * @return a new ViewHistory object
      */
     public createViewModel(history: History): ViewHistory {
-        const user = this.DS.get(User, history.user_id);
+        const user = this.viewModelStoreService.get(ViewUser, history.user_id);
         return new ViewHistory(history, user);
     }
 
diff --git a/client/src/app/core/repositories/mediafiles/mediafile-repository.service.ts b/client/src/app/core/repositories/mediafiles/mediafile-repository.service.ts
index 11dce35bd..ec1034565 100644
--- a/client/src/app/core/repositories/mediafiles/mediafile-repository.service.ts
+++ b/client/src/app/core/repositories/mediafiles/mediafile-repository.service.ts
@@ -10,6 +10,8 @@ import { CollectionStringMapperService } from '../../core-services/collectionStr
 import { DataSendService } from 'app/core/core-services/data-send.service';
 import { HttpService } from 'app/core/core-services/http.service';
 import { HttpHeaders } from '@angular/common/http';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
+import { ViewUser } from 'app/site/users/models/view-user';
 
 /**
  * Repository for MediaFiles
@@ -28,10 +30,11 @@ export class MediafileRepositoryService extends BaseRepository<ViewMediafile, Me
     public constructor(
         DS: DataStoreService,
         mapperService: CollectionStringMapperService,
+        viewModelStoreService: ViewModelStoreService,
         private dataSend: DataSendService,
         private httpService: HttpService
     ) {
-        super(DS, mapperService, Mediafile, [User]);
+        super(DS, mapperService, viewModelStoreService, Mediafile, [User]);
     }
 
     /**
@@ -88,7 +91,7 @@ export class MediafileRepositoryService extends BaseRepository<ViewMediafile, Me
      * @returns a new mediafile ViewModel
      */
     public createViewModel(file: Mediafile): ViewMediafile {
-        const uploader = this.DS.get(User, file.uploader_id);
+        const uploader = this.viewModelStoreService.get(ViewUser, file.uploader_id);
         return new ViewMediafile(file, uploader);
     }
 }
diff --git a/client/src/app/core/repositories/motions/category-repository.service.ts b/client/src/app/core/repositories/motions/category-repository.service.ts
index ab61a3725..8ff40175e 100644
--- a/client/src/app/core/repositories/motions/category-repository.service.ts
+++ b/client/src/app/core/repositories/motions/category-repository.service.ts
@@ -9,6 +9,7 @@ import { Motion } from 'app/shared/models/motions/motion';
 import { HttpService } from '../../core-services/http.service';
 import { Identifiable } from 'app/shared/models/base/identifiable';
 import { CollectionStringMapperService } from '../../core-services/collectionStringMapper.service';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
 
 /**
  * Repository Services for Categories
@@ -37,10 +38,11 @@ export class CategoryRepositoryService extends BaseRepository<ViewCategory, Cate
     public constructor(
         protected DS: DataStoreService,
         mapperService: CollectionStringMapperService,
+        viewModelStoreService: ViewModelStoreService,
         private dataSend: DataSendService,
         private httpService: HttpService
     ) {
-        super(DS, mapperService, Category);
+        super(DS, mapperService, viewModelStoreService, Category);
     }
 
     protected createViewModel(category: Category): ViewCategory {
diff --git a/client/src/app/core/repositories/motions/change-recommendation-repository.service.ts b/client/src/app/core/repositories/motions/change-recommendation-repository.service.ts
index 0043b1421..224a0a94e 100644
--- a/client/src/app/core/repositories/motions/change-recommendation-repository.service.ts
+++ b/client/src/app/core/repositories/motions/change-recommendation-repository.service.ts
@@ -3,16 +3,17 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { DataSendService } from '../../core-services/data-send.service';
+import { DataSendService } from 'app/core/core-services/data-send.service';
 import { User } from 'app/shared/models/users/user';
 import { Category } from 'app/shared/models/motions/category';
 import { Workflow } from 'app/shared/models/motions/workflow';
 import { BaseRepository } from '../base-repository';
-import { DataStoreService } from '../../core-services/data-store.service';
-import { MotionChangeReco } from 'app/shared/models/motions/motion-change-reco';
-import { ViewChangeReco } from 'app/site/motions/models/view-change-reco';
+import { DataStoreService } from 'app/core/core-services/data-store.service';
+import { MotionChangeRecommendation } from 'app/shared/models/motions/motion-change-reco';
+import { ViewMotionChangeRecommendation } from 'app/site/motions/models/view-change-recommendation';
 import { Identifiable } from 'app/shared/models/base/identifiable';
-import { CollectionStringMapperService } from '../../core-services/collectionStringMapper.service';
+import { CollectionStringMapperService } from 'app/core/core-services/collectionStringMapper.service';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
 
 /**
  * Repository Services for change recommendations
@@ -27,7 +28,10 @@ import { CollectionStringMapperService } from '../../core-services/collectionStr
 @Injectable({
     providedIn: 'root'
 })
-export class ChangeRecommendationRepositoryService extends BaseRepository<ViewChangeReco, MotionChangeReco> {
+export class ChangeRecommendationRepositoryService extends BaseRepository<
+    ViewMotionChangeRecommendation,
+    MotionChangeRecommendation
+> {
     /**
      * Creates a MotionRepository
      *
@@ -41,18 +45,19 @@ export class ChangeRecommendationRepositoryService extends BaseRepository<ViewCh
     public constructor(
         DS: DataStoreService,
         mapperService: CollectionStringMapperService,
+        viewModelStoreService: ViewModelStoreService,
         private dataSend: DataSendService
     ) {
-        super(DS, mapperService, MotionChangeReco, [Category, User, Workflow]);
+        super(DS, mapperService, viewModelStoreService, MotionChangeRecommendation, [Category, User, Workflow]);
     }
 
     /**
      * Creates a change recommendation
      * Creates a (real) change recommendation and delegates it to the {@link DataSendService}
      *
-     * @param {MotionChangeReco} changeReco
+     * @param {MotionChangeRecommendation} changeReco
      */
-    public async create(changeReco: MotionChangeReco): Promise<Identifiable> {
+    public async create(changeReco: MotionChangeRecommendation): Promise<Identifiable> {
         return await this.dataSend.createModel(changeReco);
     }
 
@@ -61,17 +66,17 @@ export class ChangeRecommendationRepositoryService extends BaseRepository<ViewCh
      * @param view
      * @returns The id of the created change recommendation
      */
-    public async createByViewModel(view: ViewChangeReco): Promise<Identifiable> {
+    public async createByViewModel(view: ViewMotionChangeRecommendation): Promise<Identifiable> {
         return await this.dataSend.createModel(view.changeRecommendation);
     }
 
     /**
      * Creates this view wrapper based on an actual Change Recommendation model
      *
-     * @param {MotionChangeReco} model
+     * @param {MotionChangeRecommendation} model
      */
-    protected createViewModel(model: MotionChangeReco): ViewChangeReco {
-        return new ViewChangeReco(model);
+    protected createViewModel(model: MotionChangeRecommendation): ViewMotionChangeRecommendation {
+        return new ViewMotionChangeRecommendation(model);
     }
 
     /**
@@ -79,9 +84,9 @@ export class ChangeRecommendationRepositoryService extends BaseRepository<ViewCh
      *
      * Extract the change recommendation out of the viewModel and delegate
      * to {@link DataSendService}
-     * @param {ViewChangeReco} viewModel
+     * @param {ViewMotionChangeRecommendation} viewModel
      */
-    public async delete(viewModel: ViewChangeReco): Promise<void> {
+    public async delete(viewModel: ViewMotionChangeRecommendation): Promise<void> {
         await this.dataSend.deleteModel(viewModel.changeRecommendation);
     }
 
@@ -91,10 +96,13 @@ export class ChangeRecommendationRepositoryService extends BaseRepository<ViewCh
      * Updates a (real) change recommendation with patched data and delegate it
      * to the {@link DataSendService}
      *
-     * @param {Partial<MotionChangeReco>} update the form data containing the update values
-     * @param {ViewChangeReco} viewModel The View Change Recommendation. If not present, a new motion will be created
+     * @param {Partial<MotionChangeRecommendation>} update the form data containing the update values
+     * @param {ViewMotionChangeRecommendation} viewModel The View Change Recommendation. If not present, a new motion will be created
      */
-    public async update(update: Partial<MotionChangeReco>, viewModel: ViewChangeReco): Promise<void> {
+    public async update(
+        update: Partial<MotionChangeRecommendation>,
+        viewModel: ViewMotionChangeRecommendation
+    ): Promise<void> {
         const changeReco = viewModel.changeRecommendation;
         changeReco.patchValues(update);
         await this.dataSend.partialUpdateModel(changeReco);
@@ -103,9 +111,9 @@ export class ChangeRecommendationRepositoryService extends BaseRepository<ViewCh
     /**
      * return the Observable of all change recommendations belonging to the given motion
      */
-    public getChangeRecosOfMotionObservable(motion_id: number): Observable<ViewChangeReco[]> {
+    public getChangeRecosOfMotionObservable(motion_id: number): Observable<ViewMotionChangeRecommendation[]> {
         return this.viewModelListSubject.asObservable().pipe(
-            map((recos: ViewChangeReco[]) => {
+            map((recos: ViewMotionChangeRecommendation[]) => {
                 return recos.filter(reco => reco.motion_id === motion_id);
             })
         );
@@ -117,16 +125,16 @@ export class ChangeRecommendationRepositoryService extends BaseRepository<ViewCh
      * @param motionId the id of the target motion
      * @returns the array of change recommendations to the motions.
      */
-    public getChangeRecoOfMotion(motion_id: number): ViewChangeReco[] {
+    public getChangeRecoOfMotion(motion_id: number): ViewMotionChangeRecommendation[] {
         return this.getViewModelList().filter(reco => reco.motion_id === motion_id);
     }
 
     /**
      * Sets a change recommendation to accepted.
      *
-     * @param {ViewChangeReco} change
+     * @param {ViewMotionChangeRecommendation} change
      */
-    public async setAccepted(change: ViewChangeReco): Promise<void> {
+    public async setAccepted(change: ViewMotionChangeRecommendation): Promise<void> {
         const changeReco = change.changeRecommendation;
         changeReco.patchValues({
             rejected: false
@@ -137,9 +145,9 @@ export class ChangeRecommendationRepositoryService extends BaseRepository<ViewCh
     /**
      * Sets a change recommendation to rejected.
      *
-     * @param {ViewChangeReco} change
+     * @param {ViewMotionChangeRecommendation} change
      */
-    public async setRejected(change: ViewChangeReco): Promise<void> {
+    public async setRejected(change: ViewMotionChangeRecommendation): Promise<void> {
         const changeReco = change.changeRecommendation;
         changeReco.patchValues({
             rejected: true
@@ -150,10 +158,10 @@ export class ChangeRecommendationRepositoryService extends BaseRepository<ViewCh
     /**
      * Sets if a change recommendation is internal (for the administrators) or not.
      *
-     * @param {ViewChangeReco} change
+     * @param {ViewMotionChangeRecommendation} change
      * @param {boolean} internal
      */
-    public async setInternal(change: ViewChangeReco, internal: boolean): Promise<void> {
+    public async setInternal(change: ViewMotionChangeRecommendation, internal: boolean): Promise<void> {
         const changeReco = change.changeRecommendation;
         changeReco.patchValues({
             internal: internal
diff --git a/client/src/app/core/repositories/motions/motion-block-repository.service.ts b/client/src/app/core/repositories/motions/motion-block-repository.service.ts
index 35f4ec405..598922b44 100644
--- a/client/src/app/core/repositories/motions/motion-block-repository.service.ts
+++ b/client/src/app/core/repositories/motions/motion-block-repository.service.ts
@@ -14,6 +14,9 @@ import { MotionBlock } from 'app/shared/models/motions/motion-block';
 import { MotionRepositoryService } from './motion-repository.service';
 import { ViewMotion } from 'app/site/motions/models/view-motion';
 import { ViewMotionBlock } from 'app/site/motions/models/view-motion-block';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
+import { Item } from 'app/shared/models/agenda/item';
+import { ViewItem } from 'app/site/agenda/models/view-item';
 
 /**
  * Repository service for motion blocks
@@ -34,11 +37,12 @@ export class MotionBlockRepositoryService extends BaseRepository<ViewMotionBlock
     public constructor(
         DS: DataStoreService,
         mapperService: CollectionStringMapperService,
+        viewModelStoreService: ViewModelStoreService,
         private dataSend: DataSendService,
         private motionRepo: MotionRepositoryService,
         private httpService: HttpService
     ) {
-        super(DS, mapperService, MotionBlock);
+        super(DS, mapperService, viewModelStoreService, MotionBlock, [Item]);
     }
 
     /**
@@ -80,7 +84,8 @@ export class MotionBlockRepositoryService extends BaseRepository<ViewMotionBlock
      * @returns a new ViewMotionBlock
      */
     protected createViewModel(block: MotionBlock): ViewMotionBlock {
-        return new ViewMotionBlock(block);
+        const item = this.viewModelStoreService.get(ViewItem, block.agenda_item_id);
+        return new ViewMotionBlock(block, item);
     }
 
     /**
diff --git a/client/src/app/core/repositories/motions/motion-comment-section-repository.service.ts b/client/src/app/core/repositories/motions/motion-comment-section-repository.service.ts
index 7c616683d..d35083003 100644
--- a/client/src/app/core/repositories/motions/motion-comment-section-repository.service.ts
+++ b/client/src/app/core/repositories/motions/motion-comment-section-repository.service.ts
@@ -9,6 +9,8 @@ import { Group } from 'app/shared/models/users/group';
 import { Identifiable } from 'app/shared/models/base/identifiable';
 import { CollectionStringMapperService } from '../../core-services/collectionStringMapper.service';
 import { HttpService } from 'app/core/core-services/http.service';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
+import { ViewGroup } from 'app/site/users/models/view-group';
 
 /**
  * Repository Services for Categories
@@ -38,12 +40,13 @@ export class MotionCommentSectionRepositoryService extends BaseRepository<
      * @param http Service to handle direct http-communication
      */
     public constructor(
+        DS: DataStoreService,
         mapperService: CollectionStringMapperService,
-        protected DS: DataStoreService,
+        viewModelStoreService: ViewModelStoreService,
         private dataSend: DataSendService,
         private http: HttpService
     ) {
-        super(DS, mapperService, MotionCommentSection, [Group]);
+        super(DS, mapperService, viewModelStoreService, MotionCommentSection, [Group]);
     }
 
     /**
@@ -53,9 +56,9 @@ export class MotionCommentSectionRepositoryService extends BaseRepository<
      * @returns the View Model representation of the MotionCommentSection
      */
     protected createViewModel(section: MotionCommentSection): ViewMotionCommentSection {
-        const read_groups = this.DS.getMany(Group, section.read_groups_id);
-        const write_groups = this.DS.getMany(Group, section.write_groups_id);
-        return new ViewMotionCommentSection(section, read_groups, write_groups);
+        const readGroups = this.viewModelStoreService.getMany(ViewGroup, section.read_groups_id);
+        const writeGroups = this.viewModelStoreService.getMany(ViewGroup, section.write_groups_id);
+        return new ViewMotionCommentSection(section, readGroups, writeGroups);
     }
 
     /**
diff --git a/client/src/app/core/repositories/motions/motion-repository.service.ts b/client/src/app/core/repositories/motions/motion-repository.service.ts
index 65c926815..16c42b76a 100644
--- a/client/src/app/core/repositories/motions/motion-repository.service.ts
+++ b/client/src/app/core/repositories/motions/motion-repository.service.ts
@@ -19,19 +19,27 @@ import { LinenumberingService } from '../../ui-services/linenumbering.service';
 import { Mediafile } from 'app/shared/models/mediafiles/mediafile';
 import { Motion } from 'app/shared/models/motions/motion';
 import { MotionBlock } from 'app/shared/models/motions/motion-block';
-import { MotionChangeReco } from 'app/shared/models/motions/motion-change-reco';
+import { MotionChangeRecommendation } from 'app/shared/models/motions/motion-change-reco';
 import { MotionPoll } from 'app/shared/models/motions/motion-poll';
 import { OSTreeSortEvent } from 'app/shared/components/sorting-tree/sorting-tree.component';
 import { PersonalNoteService } from '../../ui-services/personal-note.service';
 import { TreeService } from 'app/core/ui-services/tree.service';
-import { User } from '../../../shared/models/users/user';
-import { ViewChangeReco } from '../../../site/motions/models/view-change-reco';
-import { ViewMotionAmendedParagraph } from '../../../site/motions/models/view-motion-amended-paragraph';
-import { ViewUnifiedChange } from '../../../site/motions/models/view-unified-change';
-import { ViewStatuteParagraph } from '../../../site/motions/models/view-statute-paragraph';
-import { Workflow } from '../../../shared/models/motions/workflow';
-import { WorkflowState } from '../../../shared/models/motions/workflow-state';
+import { User } from 'app/shared/models/users/user';
+import { ViewMotionChangeRecommendation } from 'app/site/motions/models/view-change-recommendation';
+import { ViewMotionAmendedParagraph } from 'app/site/motions/models/view-motion-amended-paragraph';
+import { ViewUnifiedChange } from 'app/site/motions/models/view-unified-change';
+import { ViewStatuteParagraph } from 'app/site/motions/models/view-statute-paragraph';
+import { Workflow } from 'app/shared/models/motions/workflow';
+import { WorkflowState } from 'app/shared/models/motions/workflow-state';
 import { Tag } from 'app/shared/models/core/tag';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
+import { ViewCategory } from 'app/site/motions/models/view-category';
+import { ViewUser } from 'app/site/users/models/view-user';
+import { ViewWorkflow } from 'app/site/motions/models/view-workflow';
+import { ViewItem } from 'app/site/agenda/models/view-item';
+import { ViewMotionBlock } from 'app/site/motions/models/view-motion-block';
+import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile';
+import { ViewTag } from 'app/site/tags/models/view-tag';
 
 /**
  * Repository Services for motions (and potentially categories)
@@ -64,6 +72,7 @@ export class MotionRepositoryService extends BaseRepository<ViewMotion, Motion>
     public constructor(
         DS: DataStoreService,
         mapperService: CollectionStringMapperService,
+        viewModelStoreService: ViewModelStoreService,
         private dataSend: DataSendService,
         private httpService: HttpService,
         private readonly lineNumbering: LinenumberingService,
@@ -72,7 +81,15 @@ export class MotionRepositoryService extends BaseRepository<ViewMotion, Motion>
         private personalNoteService: PersonalNoteService,
         private translate: TranslateService
     ) {
-        super(DS, mapperService, Motion, [Category, User, Workflow, Item, MotionBlock, Mediafile, Tag]);
+        super(DS, mapperService, viewModelStoreService, Motion, [
+            Category,
+            User,
+            Workflow,
+            Item,
+            MotionBlock,
+            Mediafile,
+            Tag
+        ]);
     }
 
     /**
@@ -84,15 +101,15 @@ export class MotionRepositoryService extends BaseRepository<ViewMotion, Motion>
      * @param motion blank motion domain object
      */
     protected createViewModel(motion: Motion): ViewMotion {
-        const category = this.DS.get(Category, motion.category_id);
-        const submitters = this.DS.getMany(User, motion.submitterIds);
-        const supporters = this.DS.getMany(User, motion.supporters_id);
-        const workflow = this.DS.get(Workflow, motion.workflow_id);
-        const item = this.DS.get(Item, motion.agenda_item_id);
-        const block = this.DS.get(MotionBlock, motion.motion_block_id);
-        const attachments = this.DS.getMany(Mediafile, motion.attachments_id);
-        const tags = this.DS.getMany(Tag, motion.tags_id);
-        const parent = this.DS.get(Motion, motion.parent_id);
+        const category = this.viewModelStoreService.get(ViewCategory, motion.category_id);
+        const submitters = this.viewModelStoreService.getMany(ViewUser, motion.submitterIds);
+        const supporters = this.viewModelStoreService.getMany(ViewUser, motion.supporters_id);
+        const workflow = this.viewModelStoreService.get(ViewWorkflow, motion.workflow_id);
+        const item = this.viewModelStoreService.get(ViewItem, motion.agenda_item_id);
+        const block = this.viewModelStoreService.get(ViewMotionBlock, motion.motion_block_id);
+        const attachments = this.viewModelStoreService.getMany(ViewMediafile, motion.attachments_id);
+        const tags = this.viewModelStoreService.getMany(ViewTag, motion.tags_id);
+        const parent = this.viewModelStoreService.get(ViewMotion, motion.parent_id);
         let state: WorkflowState = null;
         if (workflow) {
             state = workflow.getStateById(motion.state_id);
@@ -260,7 +277,7 @@ export class MotionRepositoryService extends BaseRepository<ViewMotion, Motion>
      * @param viewMotion The motion to change the submitters from
      * @param submitters The submitters to set
      */
-    public async setSubmitters(viewMotion: ViewMotion, submitters: User[]): Promise<void> {
+    public async setSubmitters(viewMotion: ViewMotion, submitters: ViewUser[]): Promise<void> {
         const requestData = {
             motions: [
                 {
@@ -525,8 +542,8 @@ export class MotionRepositoryService extends BaseRepository<ViewMotion, Motion>
         motionId: number,
         lineRange: LineRange,
         lineLength: number
-    ): ViewChangeReco {
-        const changeReco = new MotionChangeReco();
+    ): ViewMotionChangeRecommendation {
+        const changeReco = new MotionChangeRecommendation();
         changeReco.line_from = lineRange.from;
         changeReco.line_to = lineRange.to;
         changeReco.type = ModificationType.TYPE_REPLACEMENT;
@@ -534,7 +551,7 @@ export class MotionRepositoryService extends BaseRepository<ViewMotion, Motion>
         changeReco.rejected = false;
         changeReco.motion_id = motionId;
 
-        return new ViewChangeReco(changeReco);
+        return new ViewMotionChangeRecommendation(changeReco);
     }
 
     /**
diff --git a/client/src/app/core/repositories/motions/statute-paragraph-repository.service.ts b/client/src/app/core/repositories/motions/statute-paragraph-repository.service.ts
index e8a6ebe2f..3fa433ed4 100644
--- a/client/src/app/core/repositories/motions/statute-paragraph-repository.service.ts
+++ b/client/src/app/core/repositories/motions/statute-paragraph-repository.service.ts
@@ -7,6 +7,7 @@ import { ViewStatuteParagraph } from 'app/site/motions/models/view-statute-parag
 import { StatuteParagraph } from 'app/shared/models/motions/statute-paragraph';
 import { Identifiable } from 'app/shared/models/base/identifiable';
 import { CollectionStringMapperService } from '../../core-services/collectionStringMapper.service';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
 
 /**
  * Repository Services for statute paragraphs
@@ -31,9 +32,10 @@ export class StatuteParagraphRepositoryService extends BaseRepository<ViewStatut
     public constructor(
         DS: DataStoreService,
         mapperService: CollectionStringMapperService,
+        viewModelStoreService: ViewModelStoreService,
         private dataSend: DataSendService
     ) {
-        super(DS, mapperService, StatuteParagraph);
+        super(DS, mapperService, viewModelStoreService, StatuteParagraph);
     }
 
     protected createViewModel(statuteParagraph: StatuteParagraph): ViewStatuteParagraph {
diff --git a/client/src/app/core/repositories/motions/workflow-repository.service.ts b/client/src/app/core/repositories/motions/workflow-repository.service.ts
index f7253863e..291c2b9aa 100644
--- a/client/src/app/core/repositories/motions/workflow-repository.service.ts
+++ b/client/src/app/core/repositories/motions/workflow-repository.service.ts
@@ -10,6 +10,7 @@ import { CollectionStringMapperService } from '../../core-services/collectionStr
 import { WorkflowState } from 'app/shared/models/motions/workflow-state';
 import { ViewMotion } from 'app/site/motions/models/view-motion';
 import { HttpService } from 'app/core/core-services/http.service';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
 
 /**
  * Repository Services for Categories
@@ -40,12 +41,13 @@ export class WorkflowRepositoryService extends BaseRepository<ViewWorkflow, Work
      * @param httpService HttpService
      */
     public constructor(
-        protected DS: DataStoreService,
+        DS: DataStoreService,
         mapperService: CollectionStringMapperService,
-        private dataSend: DataSendService,
-        private httpService: HttpService
+        private httpService: HttpService,
+        viewModelStoreService: ViewModelStoreService,
+        private dataSend: DataSendService
     ) {
-        super(DS, mapperService, Workflow);
+        super(DS, mapperService, viewModelStoreService, Workflow);
     }
 
     /**
diff --git a/client/src/app/core/repositories/projector/countdown-repository.service.ts b/client/src/app/core/repositories/projector/countdown-repository.service.ts
index 4d3a4f111..b74700884 100644
--- a/client/src/app/core/repositories/projector/countdown-repository.service.ts
+++ b/client/src/app/core/repositories/projector/countdown-repository.service.ts
@@ -6,6 +6,7 @@ import { Identifiable } from 'app/shared/models/base/identifiable';
 import { CollectionStringMapperService } from '../../core-services/collectionStringMapper.service';
 import { ViewCountdown } from 'app/site/projector/models/view-countdown';
 import { Countdown } from 'app/shared/models/core/countdown';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
 
 @Injectable({
     providedIn: 'root'
@@ -14,9 +15,10 @@ export class CountdownRepositoryService extends BaseRepository<ViewCountdown, Co
     public constructor(
         DS: DataStoreService,
         mapperService: CollectionStringMapperService,
+        viewModelStoreService: ViewModelStoreService,
         private dataSend: DataSendService
     ) {
-        super(DS, mapperService, Countdown);
+        super(DS, mapperService, viewModelStoreService, Countdown);
     }
 
     protected createViewModel(countdown: Countdown): ViewCountdown {
diff --git a/client/src/app/core/repositories/projector/projector-repository.service.ts b/client/src/app/core/repositories/projector/projector-repository.service.ts
index 1410cde96..d47b25000 100644
--- a/client/src/app/core/repositories/projector/projector-repository.service.ts
+++ b/client/src/app/core/repositories/projector/projector-repository.service.ts
@@ -8,6 +8,7 @@ import { Identifiable } from 'app/shared/models/base/identifiable';
 import { ViewProjector } from 'app/site/projector/models/view-projector';
 import { Projector } from 'app/shared/models/core/projector';
 import { HttpService } from 'app/core/core-services/http.service';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
 
 /**
  * Directions for scale and scroll requests.
@@ -36,10 +37,11 @@ export class ProjectorRepositoryService extends BaseRepository<ViewProjector, Pr
     public constructor(
         DS: DataStoreService,
         mapperService: CollectionStringMapperService,
+        viewModelStoreService: ViewModelStoreService,
         private dataSend: DataSendService,
         private http: HttpService
     ) {
-        super(DS, mapperService, Projector);
+        super(DS, mapperService, viewModelStoreService, Projector);
     }
 
     /**
diff --git a/client/src/app/core/repositories/projector/projectormessage-repository.service.ts b/client/src/app/core/repositories/projector/projectormessage-repository.service.ts
index 98dd352df..c61de9854 100644
--- a/client/src/app/core/repositories/projector/projectormessage-repository.service.ts
+++ b/client/src/app/core/repositories/projector/projectormessage-repository.service.ts
@@ -5,13 +5,18 @@ import { Identifiable } from 'app/shared/models/base/identifiable';
 import { CollectionStringMapperService } from '../../core-services/collectionStringMapper.service';
 import { ProjectorMessage } from 'app/shared/models/core/projector-message';
 import { ViewProjectorMessage } from 'app/site/projector/models/view-projectormessage';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
 
 @Injectable({
     providedIn: 'root'
 })
 export class ProjectorMessageRepositoryService extends BaseRepository<ViewProjectorMessage, ProjectorMessage> {
-    public constructor(DS: DataStoreService, mapperService: CollectionStringMapperService) {
-        super(DS, mapperService, ProjectorMessage);
+    public constructor(
+        DS: DataStoreService,
+        mapperService: CollectionStringMapperService,
+        viewModelStoreService: ViewModelStoreService
+    ) {
+        super(DS, mapperService, viewModelStoreService, ProjectorMessage);
     }
 
     protected createViewModel(message: ProjectorMessage): ViewProjectorMessage {
diff --git a/client/src/app/core/repositories/tags/tag-repository.service.ts b/client/src/app/core/repositories/tags/tag-repository.service.ts
index ea81504db..1d2380d62 100644
--- a/client/src/app/core/repositories/tags/tag-repository.service.ts
+++ b/client/src/app/core/repositories/tags/tag-repository.service.ts
@@ -7,6 +7,7 @@ import { DataStoreService } from '../../core-services/data-store.service';
 import { BaseRepository } from '../base-repository';
 import { Identifiable } from 'app/shared/models/base/identifiable';
 import { CollectionStringMapperService } from '../../core-services/collectionStringMapper.service';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
 
 /**
  * Repository Services for Tags
@@ -34,9 +35,10 @@ export class TagRepositoryService extends BaseRepository<ViewTag, Tag> {
     public constructor(
         protected DS: DataStoreService,
         mapperService: CollectionStringMapperService,
+        viewModelStoreService: ViewModelStoreService,
         private dataSend: DataSendService
     ) {
-        super(DS, mapperService, Tag);
+        super(DS, mapperService, viewModelStoreService, Tag);
     }
 
     protected createViewModel(tag: Tag): ViewTag {
diff --git a/client/src/app/core/repositories/users/group-repository.service.ts b/client/src/app/core/repositories/users/group-repository.service.ts
index 33349aaec..542787a1f 100644
--- a/client/src/app/core/repositories/users/group-repository.service.ts
+++ b/client/src/app/core/repositories/users/group-repository.service.ts
@@ -8,6 +8,7 @@ import { DataStoreService } from '../../core-services/data-store.service';
 import { Group } from 'app/shared/models/users/group';
 import { Identifiable } from 'app/shared/models/base/identifiable';
 import { ViewGroup } from 'app/site/users/models/view-group';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
 
 /**
  * Shape of a permission
@@ -49,10 +50,11 @@ export class GroupRepositoryService extends BaseRepository<ViewGroup, Group> {
     public constructor(
         DS: DataStoreService,
         mapperService: CollectionStringMapperService,
+        viewModelStoreService: ViewModelStoreService,
         private dataSend: DataSendService,
         private constants: ConstantsService
     ) {
-        super(DS, mapperService, Group);
+        super(DS, mapperService, viewModelStoreService, Group);
         this.sortPermsPerApp();
     }
 
diff --git a/client/src/app/core/repositories/users/personal-note-repository.service.ts b/client/src/app/core/repositories/users/personal-note-repository.service.ts
index e2aa6797e..15726c1d8 100644
--- a/client/src/app/core/repositories/users/personal-note-repository.service.ts
+++ b/client/src/app/core/repositories/users/personal-note-repository.service.ts
@@ -5,34 +5,40 @@ import { BaseRepository } from '../base-repository';
 import { CollectionStringMapperService } from '../../core-services/collectionStringMapper.service';
 import { PersonalNote } from 'app/shared/models/users/personal-note';
 import { Identifiable } from 'app/shared/models/base/identifiable';
+import { ViewPersonalNote } from 'app/site/users/models/view-personal-note';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
 
 /**
  */
 @Injectable({
     providedIn: 'root'
 })
-export class PersonalNoteRepositoryService extends BaseRepository<any, PersonalNote> {
+export class PersonalNoteRepositoryService extends BaseRepository<ViewPersonalNote, PersonalNote> {
     /**
      * @param DS The DataStore
      * @param mapperService Maps collection strings to classes
      */
-    public constructor(protected DS: DataStoreService, mapperService: CollectionStringMapperService) {
-        super(DS, mapperService, PersonalNote);
+    public constructor(
+        DS: DataStoreService,
+        mapperService: CollectionStringMapperService,
+        viewModelStoreService: ViewModelStoreService
+    ) {
+        super(DS, mapperService, viewModelStoreService, PersonalNote);
     }
 
-    protected createViewModel(personalNote: PersonalNote): any {
-        return {};
+    protected createViewModel(personalNote: PersonalNote): ViewPersonalNote {
+        return new ViewPersonalNote();
     }
 
     public async create(personalNote: PersonalNote): Promise<Identifiable> {
         throw new Error('TODO');
     }
 
-    public async update(personalNote: Partial<PersonalNote>, viewPersonalNote: any): Promise<void> {
+    public async update(personalNote: Partial<PersonalNote>, viewPersonalNote: ViewPersonalNote): Promise<void> {
         throw new Error('TODO');
     }
 
-    public async delete(viewPersonalNote: any): Promise<void> {
+    public async delete(viewPersonalNote: ViewPersonalNote): Promise<void> {
         throw new Error('TODO');
     }
 }
diff --git a/client/src/app/core/repositories/users/user-repository.service.ts b/client/src/app/core/repositories/users/user-repository.service.ts
index 404c88b37..f061848d7 100644
--- a/client/src/app/core/repositories/users/user-repository.service.ts
+++ b/client/src/app/core/repositories/users/user-repository.service.ts
@@ -12,6 +12,8 @@ import { ConfigService } from 'app/core/ui-services/config.service';
 import { HttpService } from 'app/core/core-services/http.service';
 import { TranslateService } from '@ngx-translate/core';
 import { environment } from '../../../../environments/environment';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
+import { ViewGroup } from 'app/site/users/models/view-group';
 
 /**
  * type for determining the user name from a string during import.
@@ -38,12 +40,13 @@ export class UserRepositoryService extends BaseRepository<ViewUser, User> {
     public constructor(
         DS: DataStoreService,
         mapperService: CollectionStringMapperService,
+        viewModelStoreService: ViewModelStoreService,
         private dataSend: DataSendService,
         private translate: TranslateService,
         private httpService: HttpService,
         private configService: ConfigService
     ) {
-        super(DS, mapperService, User, [Group]);
+        super(DS, mapperService, viewModelStoreService, User, [Group]);
     }
 
     /**
@@ -104,7 +107,7 @@ export class UserRepositoryService extends BaseRepository<ViewUser, User> {
     }
 
     public createViewModel(user: User): ViewUser {
-        const groups = this.DS.getMany(Group, user.groups_id);
+        const groups = this.viewModelStoreService.getMany(ViewGroup, user.groups_id);
         return new ViewUser(user, groups);
     }
 
@@ -218,20 +221,9 @@ export class UserRepositoryService extends BaseRepository<ViewUser, User> {
      * @returns all users matching that name
      */
     public getUsersByName(name: string): ViewUser[] {
-        const results: ViewUser[] = [];
-        const users = this.DS.getAll(User).filter(user => {
-            if (user.full_name === name || user.short_name === name) {
-                return true;
-            }
-            if (user.number === name) {
-                return true;
-            }
-            return false;
+        return this.getViewModelList().filter(user => {
+            return user.full_name === name || user.short_name === name || user.number === name;
         });
-        users.forEach(user => {
-            results.push(this.createViewModel(user));
-        });
-        return results;
     }
 
     /**
@@ -241,7 +233,7 @@ export class UserRepositoryService extends BaseRepository<ViewUser, User> {
      * @returns all users matching that number
      */
     public getUsersByNumber(number: string): ViewUser[] {
-        return this.getViewModelList().filter(user => user.participant_number === number);
+        return this.getViewModelList().filter(user => user.number === number);
     }
 
     /**
diff --git a/client/src/app/core/ui-services/count-users.service.ts b/client/src/app/core/ui-services/count-users.service.ts
index 2c4a54ce2..5fcab88a5 100644
--- a/client/src/app/core/ui-services/count-users.service.ts
+++ b/client/src/app/core/ui-services/count-users.service.ts
@@ -61,7 +61,7 @@ export class CountUsersService extends OpenSlidesComponent {
         });
 
         // Look for the current user.
-        operator.getObservable().subscribe(user => (this.currentUserId = user ? user.id : null));
+        operator.getUserObservable().subscribe(user => (this.currentUserId = user ? user.id : null));
     }
 
     /**
diff --git a/client/src/app/core/ui-services/personal-note.service.ts b/client/src/app/core/ui-services/personal-note.service.ts
index f6453b9a4..7f7943d3c 100644
--- a/client/src/app/core/ui-services/personal-note.service.ts
+++ b/client/src/app/core/ui-services/personal-note.service.ts
@@ -41,7 +41,7 @@ export class PersonalNoteService {
      * Watches for changes in the personal note model.
      */
     public constructor(private operator: OperatorService, private DS: DataStoreService, private http: HttpService) {
-        operator.getObservable().subscribe(() => this.updatePersonalNoteObject());
+        operator.getUserObservable().subscribe(() => this.updatePersonalNoteObject());
         this.DS.changeObservable.subscribe(model => {
             if (model instanceof PersonalNote) {
                 this.updatePersonalNoteObject();
diff --git a/client/src/app/core/ui-services/search.service.ts b/client/src/app/core/ui-services/search.service.ts
index 201e7abff..63b7e6cb8 100644
--- a/client/src/app/core/ui-services/search.service.ts
+++ b/client/src/app/core/ui-services/search.service.ts
@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
-import { BaseModel } from '../../shared/models/base/base-model';
-import { DataStoreService } from '../core-services/data-store.service';
-import { Searchable } from '../../shared/models/base/searchable';
+import { Searchable } from '../../site/base/searchable';
+import { BaseViewModel } from 'app/site/base/base-view-model';
 
 /**
  * The representation every searchable model should use to represent their data.
@@ -46,7 +45,7 @@ export interface SearchResult {
     /**
      * All matched models.
      */
-    models: (BaseModel & Searchable)[];
+    models: (BaseViewModel & Searchable)[];
 }
 
 /**
@@ -61,7 +60,6 @@ export class SearchService {
      */
     private searchModels: {
         collectionString: string;
-        ctor: new (...args: any[]) => Searchable & BaseModel;
         verboseNameSingular: string;
         verboseNamePlural: string;
         displayOrder: number;
@@ -70,7 +68,7 @@ export class SearchService {
     /**
      * @param DS The DataStore to search in.
      */
-    public constructor(private DS: DataStoreService) {}
+    public constructor() {}
 
     /**
      * Registers a model by the given attributes.
@@ -81,13 +79,12 @@ export class SearchService {
      */
     public registerModel(
         collectionString: string,
-        ctor: new (...args: any[]) => Searchable & BaseModel,
+        ctor: new (...args: any[]) => Searchable & BaseViewModel,
         displayOrder: number
     ): void {
         const instance = new ctor();
         this.searchModels.push({
             collectionString: collectionString,
-            ctor: ctor,
             verboseNameSingular: instance.getVerboseName(),
             verboseNamePlural: instance.getVerboseName(true),
             displayOrder: displayOrder
@@ -115,10 +112,10 @@ export class SearchService {
      */
     public search(query: string, inCollectionStrings: string[]): SearchResult[] {
         query = query.toLowerCase();
-        return this.searchModels
+        /*return this.searchModels
             .filter(s => inCollectionStrings.includes(s.collectionString))
             .map(searchModel => {
-                const results = this.DS.filter(searchModel.ctor, model =>
+                const results = this.viewModelStore.filter(searchModel.collectionString, model =>
                     model.formatForSearch().some(text => text.toLowerCase().includes(query))
                 );
                 return {
@@ -126,6 +123,8 @@ export class SearchService {
                     verboseName: results.length === 1 ? searchModel.verboseNameSingular : searchModel.verboseNamePlural,
                     models: results
                 };
-            });
+            });*/
+        throw new Error('Todo');
+        return [];
     }
 }
diff --git a/client/src/app/core/ui-services/tree.service.ts b/client/src/app/core/ui-services/tree.service.ts
index ace025b55..c02fc40d8 100644
--- a/client/src/app/core/ui-services/tree.service.ts
+++ b/client/src/app/core/ui-services/tree.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 
 import { OpenSlidesComponent } from 'app/openslides.component';
-import { Displayable } from 'app/shared/models/base/displayable';
+import { Displayable } from 'app/site/base/displayable';
 import { Identifiable } from 'app/shared/models/base/identifiable';
 
 /**
diff --git a/client/src/app/fullscreen-projector/fullscreen-projector/fullscreen-projector.component.ts b/client/src/app/fullscreen-projector/fullscreen-projector/fullscreen-projector.component.ts
index f186080c0..a646382a2 100644
--- a/client/src/app/fullscreen-projector/fullscreen-projector/fullscreen-projector.component.ts
+++ b/client/src/app/fullscreen-projector/fullscreen-projector/fullscreen-projector.component.ts
@@ -88,7 +88,7 @@ export class FullscreenProjectorComponent implements OnInit {
             this.isLoading = false;
         });
 
-        this.operator.getObservable().subscribe(() => {
+        this.operator.getUserObservable().subscribe(() => {
             this.canSeeProjector = this.operator.hasPerms('projector.can_see');
         });
     }
diff --git a/client/src/app/shared/components/choice-dialog/choice-dialog.component.ts b/client/src/app/shared/components/choice-dialog/choice-dialog.component.ts
index 9ee58b9ee..54b37461c 100644
--- a/client/src/app/shared/components/choice-dialog/choice-dialog.component.ts
+++ b/client/src/app/shared/components/choice-dialog/choice-dialog.component.ts
@@ -1,7 +1,7 @@
 import { Component, Inject } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
 
-import { Displayable } from 'app/shared/models/base/displayable';
+import { Displayable } from 'app/site/base/displayable';
 import { Identifiable } from 'app/shared/models/base/identifiable';
 
 /**
diff --git a/client/src/app/shared/components/copyright-sign/copyright-sign.component.ts b/client/src/app/shared/components/copyright-sign/copyright-sign.component.ts
index 5b3a695d2..cbe7b3b26 100644
--- a/client/src/app/shared/components/copyright-sign/copyright-sign.component.ts
+++ b/client/src/app/shared/components/copyright-sign/copyright-sign.component.ts
@@ -373,7 +373,7 @@ export class C4DialogComponent implements OnInit, OnDestroy {
      * Returns the operators name.
      */
     public getPlayerName(): string {
-        return this.op.user.short_name;
+        return this.op.viewUser.short_name;
     }
 
     /**
diff --git a/client/src/app/shared/components/projector/projector.component.ts b/client/src/app/shared/components/projector/projector.component.ts
index 5b8c06206..e030a079b 100644
--- a/client/src/app/shared/components/projector/projector.component.ts
+++ b/client/src/app/shared/components/projector/projector.component.ts
@@ -221,9 +221,9 @@ export class ProjectorComponent extends BaseComponent implements OnDestroy {
                 this.projectorDataService.projectorClosed(from);
             }
 
-            this.dataSubscription = this.projectorDataService
-                .getProjectorObservable(to)
-                .subscribe(data => (this.slides = data || []));
+            this.dataSubscription = this.projectorDataService.getProjectorObservable(to).subscribe(data => {
+                this.slides = data || [];
+            });
             this.projectorSubscription = this.projectorRepository.getViewModelObservable(to).subscribe(projector => {
                 if (projector) {
                     this.scroll = projector.scroll || 0;
diff --git a/client/src/app/shared/components/selectable.ts b/client/src/app/shared/components/selectable.ts
index fafb52f1a..ad5bafb19 100644
--- a/client/src/app/shared/components/selectable.ts
+++ b/client/src/app/shared/components/selectable.ts
@@ -1,4 +1,4 @@
-import { Displayable } from '../models/base/displayable';
+import { Displayable } from '../../site/base/displayable';
 import { Identifiable } from '../models/base/identifiable';
 
 /**
diff --git a/client/src/app/shared/components/sorting-tree/sorting-tree.component.spec.ts b/client/src/app/shared/components/sorting-tree/sorting-tree.component.spec.ts
index 53edf85e9..3a2b78135 100644
--- a/client/src/app/shared/components/sorting-tree/sorting-tree.component.spec.ts
+++ b/client/src/app/shared/components/sorting-tree/sorting-tree.component.spec.ts
@@ -2,7 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { E2EImportsModule } from '../../../../e2e-imports.module';
 import { SortingTreeComponent } from './sorting-tree.component';
 import { Component, ViewChild } from '@angular/core';
-import { Displayable } from 'app/shared/models/base/displayable';
+import { Displayable } from 'app/site/base/displayable';
 import { Identifiable } from 'app/shared/models/base/identifiable';
 import { BehaviorSubject } from 'rxjs';
 
diff --git a/client/src/app/shared/components/sorting-tree/sorting-tree.component.ts b/client/src/app/shared/components/sorting-tree/sorting-tree.component.ts
index 65821fccd..24814f657 100644
--- a/client/src/app/shared/components/sorting-tree/sorting-tree.component.ts
+++ b/client/src/app/shared/components/sorting-tree/sorting-tree.component.ts
@@ -6,7 +6,7 @@ import { auditTime } from 'rxjs/operators';
 import { Subscription, Observable } from 'rxjs';
 
 import { Identifiable } from 'app/shared/models/base/identifiable';
-import { Displayable } from 'app/shared/models/base/displayable';
+import { Displayable } from 'app/site/base/displayable';
 import { OSTreeNode, TreeService } from 'app/core/ui-services/tree.service';
 
 /**
diff --git a/client/src/app/shared/directives/perms.directive.ts b/client/src/app/shared/directives/perms.directive.ts
index e9623e870..d5f9f2863 100644
--- a/client/src/app/shared/directives/perms.directive.ts
+++ b/client/src/app/shared/directives/perms.directive.ts
@@ -68,7 +68,7 @@ export class PermsDirective extends OpenSlidesComponent implements OnInit, OnDes
 
     public ngOnInit(): void {
         // observe groups of operator, so the directive can actively react to changes
-        this.operatorSubscription = this.operator.getObservable().subscribe(() => {
+        this.operatorSubscription = this.operator.getUserObservable().subscribe(() => {
             this.updateView();
         });
     }
diff --git a/client/src/app/shared/models/agenda/item.ts b/client/src/app/shared/models/agenda/item.ts
index fe918a589..ce9d18179 100644
--- a/client/src/app/shared/models/agenda/item.ts
+++ b/client/src/app/shared/models/agenda/item.ts
@@ -41,7 +41,7 @@ export class Item extends BaseModel<Item> {
     public parent_id: number;
 
     public constructor(input?: any) {
-        super('agenda/item', 'Item', input);
+        super('agenda/item', input);
     }
 
     public deserialize(input: any): void {
@@ -84,16 +84,4 @@ export class Item extends BaseModel<Item> {
         const type = itemVisibilityChoices.find(choice => choice.key === this.type);
         return type ? type.csvName : '';
     }
-
-    public getTitle(): string {
-        return this.title;
-    }
-
-    public getListTitle(): string {
-        return this.title_with_type;
-    }
-
-    public getProjectorTitle(): string {
-        return this.getListTitle();
-    }
 }
diff --git a/client/src/app/shared/models/agenda/speaker.ts b/client/src/app/shared/models/agenda/speaker.ts
index a8751628f..2480eb1eb 100644
--- a/client/src/app/shared/models/agenda/speaker.ts
+++ b/client/src/app/shared/models/agenda/speaker.ts
@@ -59,12 +59,4 @@ export class Speaker extends Deserializer {
             return SpeakerState.FINISHED;
         }
     }
-
-    /**
-     * Getting the title of a speaker does not make much sense.
-     * Usually it would refer to the title of a user.
-     */
-    public getTitle(): string {
-        return '';
-    }
 }
diff --git a/client/src/app/shared/models/assignments/assignment.ts b/client/src/app/shared/models/assignments/assignment.ts
index d013044c3..f0702a826 100644
--- a/client/src/app/shared/models/assignments/assignment.ts
+++ b/client/src/app/shared/models/assignments/assignment.ts
@@ -1,7 +1,6 @@
 import { AssignmentUser } from './assignment-user';
 import { Poll } from './poll';
-import { AgendaBaseModel } from '../base/agenda-base-model';
-import { SearchRepresentation } from 'app/core/ui-services/search.service';
+import { BaseModel } from '../base/base-model';
 
 export const assignmentPhase = [
     { key: 0, name: 'Searching for candidates' },
@@ -13,7 +12,7 @@ export const assignmentPhase = [
  * Representation of an assignment.
  * @ignore
  */
-export class Assignment extends AgendaBaseModel {
+export class Assignment extends BaseModel<Assignment> {
     public id: number;
     public title: string;
     public description: string;
@@ -26,7 +25,7 @@ export class Assignment extends AgendaBaseModel {
     public tags_id: number[];
 
     public constructor(input?: any) {
-        super('assignments/assignment', 'Election', input);
+        super('assignments/assignment', input);
     }
 
     public get candidateIds(): number[] {
@@ -54,16 +53,4 @@ export class Assignment extends AgendaBaseModel {
             });
         }
     }
-
-    public getTitle(): string {
-        return this.title;
-    }
-
-    public formatForSearch(): SearchRepresentation {
-        return [this.title, this.description];
-    }
-
-    public getDetailStateURL(): string {
-        return 'TODO';
-    }
 }
diff --git a/client/src/app/shared/models/base/base-model.ts b/client/src/app/shared/models/base/base-model.ts
index b6f052e5a..06e1fac43 100644
--- a/client/src/app/shared/models/base/base-model.ts
+++ b/client/src/app/shared/models/base/base-model.ts
@@ -1,7 +1,7 @@
 import { OpenSlidesComponent } from 'app/openslides.component';
 import { Deserializable } from './deserializable';
-import { Displayable } from './displayable';
 import { Identifiable } from './identifiable';
+import { Collection } from './collection';
 
 export type ModelConstructor<T extends BaseModel<T>> = new (...args: any[]) => T;
 
@@ -10,7 +10,7 @@ export type ModelConstructor<T extends BaseModel<T>> = new (...args: any[]) => T
  * When inherit from this class, give the subclass as the type. E.g. `class Motion extends BaseModel<Motion>`
  */
 export abstract class BaseModel<T = object> extends OpenSlidesComponent
-    implements Deserializable, Displayable, Identifiable {
+    implements Deserializable, Identifiable, Collection {
     /**
      * force children of BaseModel to have a collectionString.
      *
@@ -27,11 +27,6 @@ export abstract class BaseModel<T = object> extends OpenSlidesComponent
         return this._collectionString;
     }
 
-    /**
-     * Children should also have a verbose name for generic display purposes
-     */
-    protected _verboseName: string;
-
     /**
      * force children of BaseModel to have an id
      */
@@ -44,10 +39,9 @@ export abstract class BaseModel<T = object> extends OpenSlidesComponent
      * @param verboseName
      * @param input
      */
-    protected constructor(collectionString: string, verboseName: string, input?: any) {
+    protected constructor(collectionString: string, input?: any) {
         super();
         this._collectionString = collectionString;
-        this._verboseName = verboseName;
 
         if (input) {
             this.changeNullValuesToUndef(input);
@@ -74,32 +68,6 @@ export abstract class BaseModel<T = object> extends OpenSlidesComponent
         Object.assign(this, update);
     }
 
-    public abstract getTitle(): string;
-
-    public getListTitle(): string {
-        return this.getTitle();
-    }
-
-    public toString(): string {
-        return this.getTitle();
-    }
-
-    /**
-     * Returns the verbose name. Makes it plural by adding a 's'.
-     *
-     * @param plural If the name should be plural
-     * @returns the verbose name of the model
-     */
-    public getVerboseName(plural: boolean = false): string {
-        if (plural) {
-            return this._verboseName + 's'; // I love english. This works for all our models (participantS, electionS,
-            // topicS, motionS, (media)fileS, motion blockS, commentS, personal noteS, projectorS, messageS, countdownS, ...)
-            // Just categorIES need to overwrite this...
-        } else {
-            return this._verboseName;
-        }
-    }
-
     /**
      * Most simple and most commonly used deserialize function.
      * Inherited to children, can be overwritten for special use cases
diff --git a/client/src/app/shared/models/base/collection.ts b/client/src/app/shared/models/base/collection.ts
new file mode 100644
index 000000000..71cf1a453
--- /dev/null
+++ b/client/src/app/shared/models/base/collection.ts
@@ -0,0 +1,6 @@
+/**
+ * Every implementing object should have a collection string.
+ */
+export interface Collection {
+    readonly collectionString: string;
+}
diff --git a/client/src/app/shared/models/core/chat-message.ts b/client/src/app/shared/models/core/chat-message.ts
index f13226cfb..ebe877c84 100644
--- a/client/src/app/shared/models/core/chat-message.ts
+++ b/client/src/app/shared/models/core/chat-message.ts
@@ -5,16 +5,13 @@ import { BaseModel } from '../base/base-model';
  * @ignore
  */
 export class ChatMessage extends BaseModel<ChatMessage> {
+    public static COLLECTIONSTRING = 'core/chat-message';
     public id: number;
     public message: string;
     public timestamp: string; // TODO: Type for timestamp
     public user_id: number;
 
     public constructor(input?: any) {
-        super('core/chat-message', 'Chatmessage', input);
-    }
-
-    public getTitle(): string {
-        return 'Chatmessage';
+        super(ChatMessage.COLLECTIONSTRING, input);
     }
 }
diff --git a/client/src/app/shared/models/core/config.ts b/client/src/app/shared/models/core/config.ts
index 9f7d5ee74..080202170 100644
--- a/client/src/app/shared/models/core/config.ts
+++ b/client/src/app/shared/models/core/config.ts
@@ -5,15 +5,12 @@ import { BaseModel } from '../base/base-model';
  * @ignore
  */
 export class Config extends BaseModel {
+    public static COLLECTIONSTRING = 'core/config';
     public id: number;
     public key: string;
     public value: Object;
 
     public constructor(input?: any) {
-        super('core/config', 'Config', input);
-    }
-
-    public getTitle(): string {
-        return this.key;
+        super(Config.COLLECTIONSTRING, input);
     }
 }
diff --git a/client/src/app/shared/models/core/countdown.ts b/client/src/app/shared/models/core/countdown.ts
index ea6d31ae1..f68d95da7 100644
--- a/client/src/app/shared/models/core/countdown.ts
+++ b/client/src/app/shared/models/core/countdown.ts
@@ -14,10 +14,6 @@ export class Countdown extends BaseModel<Countdown> {
     public running: boolean;
 
     public constructor(input?: any) {
-        super(Countdown.COLLECTIONSTRING, 'Countdown', input);
-    }
-
-    public getTitle(): string {
-        return this.description;
+        super(Countdown.COLLECTIONSTRING, input);
     }
 }
diff --git a/client/src/app/shared/models/core/history.ts b/client/src/app/shared/models/core/history.ts
index 70b41b36f..b894a3fa4 100644
--- a/client/src/app/shared/models/core/history.ts
+++ b/client/src/app/shared/models/core/history.ts
@@ -6,6 +6,7 @@ import { BaseModel } from '../base/base-model';
  * @ignore
  */
 export class History extends BaseModel {
+    public static COLLECTIONSTRING = 'core/history';
     public id: number;
     public element_id: string;
     public now: string;
@@ -29,10 +30,6 @@ export class History extends BaseModel {
     }
 
     public constructor(input?: any) {
-        super('core/history', 'History', input);
-    }
-
-    public getTitle(): string {
-        return this.element_id;
+        super(History.COLLECTIONSTRING, input);
     }
 }
diff --git a/client/src/app/shared/models/core/projector-message.ts b/client/src/app/shared/models/core/projector-message.ts
index 654d03408..34cd375d9 100644
--- a/client/src/app/shared/models/core/projector-message.ts
+++ b/client/src/app/shared/models/core/projector-message.ts
@@ -11,10 +11,6 @@ export class ProjectorMessage extends BaseModel<ProjectorMessage> {
     public message: string;
 
     public constructor(input?: any) {
-        super(ProjectorMessage.COLLECTIONSTRING, 'Message', input);
-    }
-
-    public getTitle(): string {
-        return 'Projectormessage';
+        super(ProjectorMessage.COLLECTIONSTRING, input);
     }
 }
diff --git a/client/src/app/shared/models/core/projector.ts b/client/src/app/shared/models/core/projector.ts
index 0da905990..c8ae50056 100644
--- a/client/src/app/shared/models/core/projector.ts
+++ b/client/src/app/shared/models/core/projector.ts
@@ -44,9 +44,14 @@ export interface ProjectionDefault {
 
 /**
  * Representation of a projector. Has the nested property "projectiondefaults"
+ *
+ * TODO: Move all function to the viewprojector.
+ *
  * @ignore
  */
 export class Projector extends BaseModel<Projector> {
+    public static COLLECTIONSTRING = 'core/projector';
+
     public id: number;
     public elements: ProjectorElements;
     public elements_preview: ProjectorElements;
@@ -60,7 +65,7 @@ export class Projector extends BaseModel<Projector> {
     public projectiondefaults: ProjectionDefault[];
 
     public constructor(input?: any) {
-        super('core/projector', 'Projector', input);
+        super(Projector.COLLECTIONSTRING, input);
     }
 
     /**
@@ -139,8 +144,4 @@ export class Projector extends BaseModel<Projector> {
             [[], []] as [T[], T[]]
         );
     }
-
-    public getTitle(): string {
-        return this.name;
-    }
 }
diff --git a/client/src/app/shared/models/core/tag.ts b/client/src/app/shared/models/core/tag.ts
index 149e7cbd8..b349b8788 100644
--- a/client/src/app/shared/models/core/tag.ts
+++ b/client/src/app/shared/models/core/tag.ts
@@ -1,27 +1,16 @@
 import { BaseModel } from '../base/base-model';
-import { Searchable } from '../base/searchable';
 
 /**
  * Representation of a tag.
  * @ignore
  */
-export class Tag extends BaseModel<Tag> implements Searchable {
+export class Tag extends BaseModel<Tag> {
+    public static COLLECTIONSTRING = 'core/tag';
+
     public id: number;
     public name: string;
 
     public constructor(input?: any) {
-        super('core/tag', 'Tag', input);
-    }
-
-    public getTitle(): string {
-        return this.name;
-    }
-
-    public formatForSearch(): string[] {
-        return [this.name];
-    }
-
-    public getDetailStateURL(): string {
-        return '/tags';
+        super(Tag.COLLECTIONSTRING, input);
     }
 }
diff --git a/client/src/app/shared/models/mediafiles/mediafile.ts b/client/src/app/shared/models/mediafiles/mediafile.ts
index f26684009..58570b746 100644
--- a/client/src/app/shared/models/mediafiles/mediafile.ts
+++ b/client/src/app/shared/models/mediafiles/mediafile.ts
@@ -1,12 +1,11 @@
 import { File } from './file';
-import { Searchable } from '../base/searchable';
 import { BaseModel } from '../base/base-model';
 
 /**
  * Representation of MediaFile. Has the nested property "File"
  * @ignore
  */
-export class Mediafile extends BaseModel<Mediafile> implements Searchable {
+export class Mediafile extends BaseModel<Mediafile> {
     public id: number;
     public title: string;
     public mediafile: File;
@@ -17,7 +16,7 @@ export class Mediafile extends BaseModel<Mediafile> implements Searchable {
     public timestamp: string;
 
     public constructor(input?: any) {
-        super('mediafiles/mediafile', 'Mediafile', input);
+        super('mediafiles/mediafile', input);
     }
 
     public deserialize(input: any): void {
@@ -30,19 +29,7 @@ export class Mediafile extends BaseModel<Mediafile> implements Searchable {
      *
      * @returns the download URL for the specific file as string
      */
-    public getDownloadUrl(): string {
+    public get downloadUrl(): string {
         return `${this.media_url_prefix}${this.mediafile.name}`;
     }
-
-    public getTitle(): string {
-        return this.title;
-    }
-
-    public formatForSearch(): string[] {
-        return [this.title, this.mediafile.name];
-    }
-
-    public getDetailStateURL(): string {
-        return this.getDownloadUrl();
-    }
 }
diff --git a/client/src/app/shared/models/motions/category.ts b/client/src/app/shared/models/motions/category.ts
index 761a60307..540473db9 100644
--- a/client/src/app/shared/models/motions/category.ts
+++ b/client/src/app/shared/models/motions/category.ts
@@ -1,52 +1,17 @@
 import { BaseModel } from '../base/base-model';
-import { Searchable } from '../base/searchable';
-import { SearchRepresentation } from 'app/core/ui-services/search.service';
 
 /**
  * Representation of a motion category. Has the nested property "File"
  * @ignore
  */
-export class Category extends BaseModel<Category> implements Searchable {
+export class Category extends BaseModel<Category> {
+    public static COLLECTIONSTRING = 'motions/category';
+
     public id: number;
     public name: string;
     public prefix: string;
 
     public constructor(input?: any) {
-        super('motions/category', 'Category', input);
-    }
-
-    public getTitle(): string {
-        return this.prefix ? this.prefix + ' - ' + this.name : this.name;
-    }
-
-    /**
-     * Returns the verbose name of this model.
-     *
-     * @override
-     * @param plural If the name should be plural
-     * @param The verbose name
-     */
-    public getVerboseName(plural: boolean = false): string {
-        if (plural) {
-            return 'Categories';
-        } else {
-            return this._verboseName;
-        }
-    }
-
-    /**
-     * Formats the category for search
-     *
-     * @override
-     */
-    public formatForSearch(): SearchRepresentation {
-        return [this.getTitle()];
-    }
-
-    /**
-     * TODO: add an id as url parameter, so the category auto-opens.
-     */
-    public getDetailStateURL(): string {
-        return '/motions/category';
+        super(Category.COLLECTIONSTRING, input);
     }
 }
diff --git a/client/src/app/shared/models/motions/motion-block.ts b/client/src/app/shared/models/motions/motion-block.ts
index 0dc597b03..c75c990d9 100644
--- a/client/src/app/shared/models/motions/motion-block.ts
+++ b/client/src/app/shared/models/motions/motion-block.ts
@@ -1,38 +1,17 @@
-import { AgendaBaseModel } from '../base/agenda-base-model';
-import { SearchRepresentation } from 'app/core/ui-services/search.service';
+import { BaseModel } from '../base/base-model';
 
 /**
  * Representation of a motion block.
  * @ignore
  */
-export class MotionBlock extends AgendaBaseModel {
+export class MotionBlock extends BaseModel {
+    public static COLLECTIONSTRING = 'motions/motion-block';
+
     public id: number;
     public title: string;
     public agenda_item_id: number;
 
     public constructor(input?: any) {
-        super('motions/motion-block', 'Motion block', input);
-    }
-
-    public getTitle(): string {
-        return this.title;
-    }
-
-    /**
-     * Formats the category for search
-     *
-     * @override
-     */
-    public formatForSearch(): SearchRepresentation {
-        return [this.title];
-    }
-
-    /**
-     * Get the URL to the motion block
-     *
-     * @returns the URL as string
-     */
-    public getDetailStateURL(): string {
-        return `/motions/blocks/${this.id}`;
+        super(MotionBlock.COLLECTIONSTRING, input);
     }
 }
diff --git a/client/src/app/shared/models/motions/motion-change-reco.ts b/client/src/app/shared/models/motions/motion-change-reco.ts
index bc1a4a6c5..083e55e1c 100644
--- a/client/src/app/shared/models/motions/motion-change-reco.ts
+++ b/client/src/app/shared/models/motions/motion-change-reco.ts
@@ -4,7 +4,9 @@ import { BaseModel } from '../base/base-model';
  * Representation of a motion change recommendation.
  * @ignore
  */
-export class MotionChangeReco extends BaseModel<MotionChangeReco> {
+export class MotionChangeRecommendation extends BaseModel<MotionChangeRecommendation> {
+    public static COLLECTIONSTRING = 'motions/motion-change-recommendation';
+
     public id: number;
     public motion_id: number;
     public rejected: boolean;
@@ -17,10 +19,6 @@ export class MotionChangeReco extends BaseModel<MotionChangeReco> {
     public creation_time: string;
 
     public constructor(input?: any) {
-        super('motions/motion-change-recommendation', 'Change recommendation', input);
-    }
-
-    public getTitle(): string {
-        return 'Changerecommendation';
+        super(MotionChangeRecommendation.COLLECTIONSTRING, input);
     }
 }
diff --git a/client/src/app/shared/models/motions/motion-comment-section.ts b/client/src/app/shared/models/motions/motion-comment-section.ts
index aa68240da..0e4a3d304 100644
--- a/client/src/app/shared/models/motions/motion-comment-section.ts
+++ b/client/src/app/shared/models/motions/motion-comment-section.ts
@@ -1,20 +1,18 @@
 import { BaseModel } from '../base/base-model';
 
 /**
- * Representation of a motion category. Has the nested property "File"
+ * Representation of a comment section.
  * @ignore
  */
 export class MotionCommentSection extends BaseModel<MotionCommentSection> {
+    public static COLLECTIONSTRING = 'motions/motion-comment-section';
+
     public id: number;
     public name: string;
     public read_groups_id: number[];
     public write_groups_id: number[];
 
     public constructor(input?: any) {
-        super('motions/motion-comment-section', 'Comment section', input);
-    }
-
-    public getTitle(): string {
-        return this.name;
+        super(MotionCommentSection.COLLECTIONSTRING, input);
     }
 }
diff --git a/client/src/app/shared/models/motions/motion.ts b/client/src/app/shared/models/motions/motion.ts
index 3f6fa7e9f..feb9803f3 100644
--- a/client/src/app/shared/models/motions/motion.ts
+++ b/client/src/app/shared/models/motions/motion.ts
@@ -1,8 +1,7 @@
 import { MotionSubmitter } from './motion-submitter';
 import { MotionComment } from './motion-comment';
-import { AgendaBaseModel } from '../base/agenda-base-model';
-import { SearchRepresentation } from 'app/core/ui-services/search.service';
 import { MotionPoll } from './motion-poll';
+import { BaseModel } from '../base/base-model';
 
 /**
  * Representation of Motion.
@@ -11,7 +10,7 @@ import { MotionPoll } from './motion-poll';
  *
  * @ignore
  */
-export class Motion extends AgendaBaseModel {
+export class Motion extends BaseModel {
     public static COLLECTIONSTRING = 'motions/motion';
 
     public id: number;
@@ -45,7 +44,7 @@ export class Motion extends AgendaBaseModel {
     public last_modified: string;
 
     public constructor(input?: any) {
-        super(Motion.COLLECTIONSTRING, 'Motion', input);
+        super(Motion.COLLECTIONSTRING, input);
     }
 
     /**
@@ -59,49 +58,6 @@ export class Motion extends AgendaBaseModel {
             .map((submitter: MotionSubmitter) => submitter.user_id);
     }
 
-    public getTitle(): string {
-        if (this.identifier) {
-            return this.identifier + ': ' + this.title;
-        } else {
-            return this.title;
-        }
-    }
-
-    public getAgendaTitle(): string {
-        // if the identifier is set, the title will be 'Motion <identifier>'.
-        if (this.identifier) {
-            return 'Motion ' + this.identifier;
-        } else {
-            return this.getTitle();
-        }
-    }
-
-    public getAgendaTitleWithType(): string {
-        // Append the verbose name only, if not the special format 'Motion <identifier>' is used.
-        if (this.identifier) {
-            return 'Motion ' + this.identifier;
-        } else {
-            return this.getTitle() + ' (' + this.getVerboseName() + ')';
-        }
-    }
-
-    /**
-     * Formats the category for search
-     *
-     * @override
-     */
-    public formatForSearch(): SearchRepresentation {
-        let searchValues = [this.title, this.text, this.reason];
-        if (this.amendment_paragraphs) {
-            searchValues = searchValues.concat(this.amendment_paragraphs.filter(x => !!x));
-        }
-        return searchValues;
-    }
-
-    public getDetailStateURL(): string {
-        return `/motions/${this.id}`;
-    }
-
     public deserialize(input: any): void {
         Object.assign(this, input);
 
diff --git a/client/src/app/shared/models/motions/statute-paragraph.ts b/client/src/app/shared/models/motions/statute-paragraph.ts
index 037b132d5..366c7336e 100644
--- a/client/src/app/shared/models/motions/statute-paragraph.ts
+++ b/client/src/app/shared/models/motions/statute-paragraph.ts
@@ -1,38 +1,18 @@
 import { BaseModel } from '../base/base-model';
-import { Searchable } from '../base/searchable';
-import { SearchRepresentation } from 'app/core/ui-services/search.service';
 
 /**
  * Representation of a statute paragraph.
  * @ignore
  */
-export class StatuteParagraph extends BaseModel<StatuteParagraph> implements Searchable {
+export class StatuteParagraph extends BaseModel<StatuteParagraph> {
+    public static COLLECTIONSTRING = 'motions/statute-paragraph';
+
     public id: number;
     public title: string;
     public text: string;
     public weight: number;
 
     public constructor(input?: any) {
-        super('motions/statute-paragraph', 'Statute paragraph', input);
-    }
-
-    public getTitle(): string {
-        return this.title;
-    }
-
-    /**
-     * Formats the category for search
-     *
-     * @override
-     */
-    public formatForSearch(): SearchRepresentation {
-        return [this.title, this.text];
-    }
-
-    /**
-     * TODO: add an id as url parameter, so the statute paragraph auto-opens.
-     */
-    public getDetailStateURL(): string {
-        return '/motions/statute-paragraphs';
+        super(StatuteParagraph.COLLECTIONSTRING, input);
     }
 }
diff --git a/client/src/app/shared/models/motions/workflow.ts b/client/src/app/shared/models/motions/workflow.ts
index 75bf9a278..9b45f8a0b 100644
--- a/client/src/app/shared/models/motions/workflow.ts
+++ b/client/src/app/shared/models/motions/workflow.ts
@@ -6,17 +6,15 @@ import { WorkflowState } from './workflow-state';
  * @ignore
  */
 export class Workflow extends BaseModel<Workflow> {
+    public static COLLECTIONSTRING = 'motions/workflow';
+
     public id: number;
     public name: string;
     public states: WorkflowState[];
     public first_state_id: number;
 
-    public get firstState(): WorkflowState {
-        return this.getStateById(this.first_state_id);
-    }
-
     public constructor(input?: any) {
-        super('motions/workflow', 'Workflow', input);
+        super(Workflow.COLLECTIONSTRING, input);
     }
 
     /**
@@ -38,10 +36,6 @@ export class Workflow extends BaseModel<Workflow> {
         });
     }
 
-    public getStateById(id: number): WorkflowState {
-        return this.states.find(state => state.id === id);
-    }
-
     public deserialize(input: any): void {
         Object.assign(this, input);
         if (input.states instanceof Array) {
@@ -51,8 +45,4 @@ export class Workflow extends BaseModel<Workflow> {
             });
         }
     }
-
-    public getTitle(): string {
-        return this.name;
-    }
 }
diff --git a/client/src/app/shared/models/topics/topic.ts b/client/src/app/shared/models/topics/topic.ts
index a4125d0f5..8a5aa4d76 100644
--- a/client/src/app/shared/models/topics/topic.ts
+++ b/client/src/app/shared/models/topics/topic.ts
@@ -1,11 +1,12 @@
-import { AgendaBaseModel } from '../base/agenda-base-model';
-import { SearchRepresentation } from 'app/core/ui-services/search.service';
+import { BaseModel } from '../base/base-model';
 
 /**
  * Representation of a topic.
  * @ignore
  */
-export class Topic extends AgendaBaseModel {
+export class Topic extends BaseModel<Topic> {
+    public static COLLECTIONSTRING = 'topics/topic';
+
     public id: number;
     public title: string;
     public text: string;
@@ -13,36 +14,6 @@ export class Topic extends AgendaBaseModel {
     public agenda_item_id: number;
 
     public constructor(input?: any) {
-        super('topics/topic', 'Topic', input);
-    }
-
-    public getTitle(): string {
-        return this.title;
-    }
-
-    public getAgendaTitleWithType(): string {
-        // Do not append ' (Topic)' to the title.
-        return this.getAgendaTitle();
-    }
-
-    /**
-     * Formats the category for search
-     *
-     * @override
-     */
-    public formatForSearch(): SearchRepresentation {
-        return [this.title, this.text];
-    }
-
-    public getDetailStateURL(): string {
-        return `/agenda/topics/${this.id}`;
-    }
-
-    /**
-     * Returns the text to be inserted in csv exports
-     * @override
-     */
-    public getCSVExportText(): string {
-        return this.text;
+        super(Topic.COLLECTIONSTRING, input);
     }
 }
diff --git a/client/src/app/shared/models/users/group.ts b/client/src/app/shared/models/users/group.ts
index 801baf359..40b269de5 100644
--- a/client/src/app/shared/models/users/group.ts
+++ b/client/src/app/shared/models/users/group.ts
@@ -5,12 +5,13 @@ import { BaseModel } from '../base/base-model';
  * @ignore
  */
 export class Group extends BaseModel<Group> {
+    public static COLLECTIONSTRING = 'users/group';
     public id: number;
     public name: string;
     public permissions: string[];
 
     public constructor(input?: any) {
-        super('users/group', 'Group', input);
+        super(Group.COLLECTIONSTRING, input);
         if (!input) {
             // permissions are required for new groups
             this.permissions = [];
diff --git a/client/src/app/shared/models/users/personal-note.ts b/client/src/app/shared/models/users/personal-note.ts
index 4f60b558b..538ebeb45 100644
--- a/client/src/app/shared/models/users/personal-note.ts
+++ b/client/src/app/shared/models/users/personal-note.ts
@@ -49,12 +49,14 @@ export interface PersonalNoteObject {
  * @ignore
  */
 export class PersonalNote extends BaseModel<PersonalNote> implements PersonalNoteObject {
+    public static COLLECTIONSTRING = 'users/personal-note';
+
     public id: number;
     public user_id: number;
     public notes: PersonalNotesFormat;
 
     public constructor(input: any) {
-        super('users/personal-note', 'Personal note', input);
+        super(PersonalNote.COLLECTIONSTRING, input);
     }
 
     public getTitle(): string {
diff --git a/client/src/app/shared/models/users/user.ts b/client/src/app/shared/models/users/user.ts
index 9fe7eb1f0..3334c5e7b 100644
--- a/client/src/app/shared/models/users/user.ts
+++ b/client/src/app/shared/models/users/user.ts
@@ -1,7 +1,4 @@
-import { Searchable } from '../base/searchable';
-import { SearchRepresentation } from 'app/core/ui-services/search.service';
 import { BaseModel } from '../base/base-model';
-import { DetailNavigable } from '../base/detail-navigable';
 
 /**
  * Iterable pre selection of genders (sexes)
@@ -12,7 +9,7 @@ export const genders = ['Female', 'Male', 'Diverse'];
  * Representation of a user in contrast to the operator.
  * @ignore
  */
-export class User extends BaseModel<User> implements Searchable, DetailNavigable {
+export class User extends BaseModel<User> {
     public static COLLECTIONSTRING = 'users/user';
 
     public id: number;
@@ -34,89 +31,10 @@ export class User extends BaseModel<User> implements Searchable, DetailNavigable
     public default_password: string;
 
     public constructor(input?: any) {
-        super(User.COLLECTIONSTRING, 'Participant', input);
-    }
-
-    public get full_name(): string {
-        let name = this.short_name;
-        const additions: string[] = [];
-
-        // addition: add number and structure level
-        const structure_level = this.structure_level ? this.structure_level.trim() : '';
-        if (structure_level) {
-            additions.push(structure_level);
-        }
-
-        const number = this.number ? this.number.trim() : null;
-        if (number) {
-            // TODO Translate
-            additions.push('No. ' + number);
-        }
-
-        if (additions.length > 0) {
-            name += ' (' + additions.join(' · ') + ')';
-        }
-        return name.trim();
+        super(User.COLLECTIONSTRING, input);
     }
 
     public containsGroupId(id: number): boolean {
         return this.groups_id.some(groupId => groupId === id);
     }
-
-    // TODO read config values for "users_sort_by"
-
-    /**
-     * Getter for the short name (Title, given name, surname)
-     *
-     * @returns a non-empty string
-     */
-    public get short_name(): string {
-        const title = this.title ? this.title.trim() : '';
-        const firstName = this.first_name ? this.first_name.trim() : '';
-        const lastName = this.last_name ? this.last_name.trim() : '';
-
-        // TODO need DS adjustment first first
-        // if (this.DS.getConfig('users_sort_by').value === 'last_name') {
-        //     if (lastName && firstName) {
-        //         shortName += `${lastName}, ${firstName}`;
-        //     } else {
-        //         shortName += lastName || firstName;
-        //     }
-        // }
-
-        let shortName = `${firstName} ${lastName}`;
-
-        if (shortName.length <= 1) {
-            // We have at least one space from the concatination of
-            // first- and lastname.
-            shortName = this.username;
-        }
-
-        if (title) {
-            shortName = `${title} ${shortName}`;
-        }
-
-        return shortName;
-    }
-
-    public getTitle(): string {
-        return this.full_name;
-    }
-
-    public getListViewTitle(): string {
-        return this.short_name;
-    }
-
-    public getDetailStateURL(): string {
-        return `/users/${this.id}`;
-    }
-
-    /**
-     * Formats the category for search
-     *
-     * @override
-     */
-    public formatForSearch(): SearchRepresentation {
-        return [this.title, this.first_name, this.last_name, this.structure_level, this.number];
-    }
 }
diff --git a/client/src/app/site/agenda/agenda.config.ts b/client/src/app/site/agenda/agenda.config.ts
index 43dfac779..e65a82046 100644
--- a/client/src/app/site/agenda/agenda.config.ts
+++ b/client/src/app/site/agenda/agenda.config.ts
@@ -1,14 +1,22 @@
 import { AppConfig } from '../../core/app-config';
 import { Item } from '../../shared/models/agenda/item';
 import { Topic } from '../../shared/models/topics/topic';
-import { AgendaRepositoryService } from 'app/core/repositories/agenda/agenda-repository.service';
+import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service';
 import { TopicRepositoryService } from 'app/core/repositories/agenda/topic-repository.service';
+import { ViewTopic } from './models/view-topic';
+import { ViewItem } from './models/view-item';
 
 export const AgendaAppConfig: AppConfig = {
     name: 'agenda',
     models: [
-        { collectionString: 'agenda/item', model: Item, repository: AgendaRepositoryService },
-        { collectionString: 'topics/topic', model: Topic, searchOrder: 1, repository: TopicRepositoryService }
+        { collectionString: 'agenda/item', model: Item, viewModel: ViewItem, repository: ItemRepositoryService },
+        {
+            collectionString: 'topics/topic',
+            model: Topic,
+            viewModel: ViewTopic,
+            searchOrder: 1,
+            repository: TopicRepositoryService
+        }
     ],
     mainMenuEntries: [
         {
diff --git a/client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts
index 542b50bcd..458b15810 100644
--- a/client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts
+++ b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.ts
@@ -5,7 +5,7 @@ import { Title } from '@angular/platform-browser';
 import { TranslateService } from '@ngx-translate/core';
 
 import { AgendaFilterListService } from '../../services/agenda-filter-list.service';
-import { AgendaRepositoryService } from 'app/core/repositories/agenda/agenda-repository.service';
+import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service';
 import { ListViewBaseComponent } from 'app/site/base/list-view-base';
 import { PromptService } from 'app/core/ui-services/prompt.service';
 import { ViewItem } from '../../models/view-item';
@@ -63,7 +63,7 @@ export class AgendaListComponent extends ListViewBaseComponent<ViewItem> impleme
         matSnackBar: MatSnackBar,
         private route: ActivatedRoute,
         private router: Router,
-        private repo: AgendaRepositoryService,
+        private repo: ItemRepositoryService,
         private promptService: PromptService,
         private dialog: MatDialog,
         private config: ConfigService,
diff --git a/client/src/app/site/agenda/components/agenda-sort/agenda-sort.component.ts b/client/src/app/site/agenda/components/agenda-sort/agenda-sort.component.ts
index 15182960d..d96bfb8b6 100644
--- a/client/src/app/site/agenda/components/agenda-sort/agenda-sort.component.ts
+++ b/client/src/app/site/agenda/components/agenda-sort/agenda-sort.component.ts
@@ -5,7 +5,7 @@ import { MatSnackBar } from '@angular/material';
 import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
 
-import { AgendaRepositoryService } from 'app/core/repositories/agenda/agenda-repository.service';
+import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service';
 import { BaseViewComponent } from '../../../base/base-view';
 import { OSTreeSortEvent } from 'app/shared/components/sorting-tree/sorting-tree.component';
 import { ViewItem } from '../../models/view-item';
@@ -39,7 +39,7 @@ export class AgendaSortComponent extends BaseViewComponent {
         title: Title,
         translate: TranslateService,
         matSnackBar: MatSnackBar,
-        private agendaRepo: AgendaRepositoryService
+        private agendaRepo: ItemRepositoryService
     ) {
         super(title, translate, matSnackBar);
         this.itemsObservable = this.agendaRepo.getViewModelListObservable();
diff --git a/client/src/app/site/agenda/components/speaker-list/speaker-list.component.ts b/client/src/app/site/agenda/components/speaker-list/speaker-list.component.ts
index d4734f5aa..85317d4aa 100644
--- a/client/src/app/site/agenda/components/speaker-list/speaker-list.component.ts
+++ b/client/src/app/site/agenda/components/speaker-list/speaker-list.component.ts
@@ -1,25 +1,25 @@
 import { ActivatedRoute } from '@angular/router';
-import { BehaviorSubject, Subscription } from 'rxjs';
 import { Component, OnInit } from '@angular/core';
 import { FormGroup, FormControl } from '@angular/forms';
 import { MatSnackBar, MatSelectChange } from '@angular/material';
 
 import { TranslateService } from '@ngx-translate/core';
+import { BehaviorSubject, Subscription } from 'rxjs';
 
-import { AgendaRepositoryService } from 'app/core/repositories/agenda/agenda-repository.service';
+import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service';
 import { BaseViewComponent } from 'app/site/base/base-view';
 import { CurrentListOfSpeakersSlideService } from 'app/site/projector/services/current-list-of-of-speakers-slide.service';
-import { DataStoreService } from 'app/core/core-services/data-store.service';
-import { DurationService } from 'app/core/ui-services/duration.service';
 import { OperatorService } from 'app/core/core-services/operator.service';
 import { ProjectorRepositoryService } from 'app/core/repositories/projector/projector-repository.service';
 import { PromptService } from 'app/core/ui-services/prompt.service';
 import { SpeakerState } from 'app/shared/models/agenda/speaker';
 import { Title } from '@angular/platform-browser';
-import { User } from 'app/shared/models/users/user';
 import { ViewItem } from '../../models/view-item';
 import { ViewSpeaker } from '../../models/view-speaker';
 import { ViewProjector } from 'app/site/projector/models/view-projector';
+import { ViewUser } from 'app/site/users/models/view-user';
+import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service';
+import { DurationService } from 'app/core/ui-services/duration.service';
 
 /**
  * The list of speakers for agenda items.
@@ -68,7 +68,7 @@ export class SpeakerListComponent extends BaseViewComponent implements OnInit {
     /**
      * Hold the users
      */
-    public users: BehaviorSubject<User[]>;
+    public users: BehaviorSubject<ViewUser[]>;
 
     /**
      * Required for the user search selector
@@ -113,12 +113,12 @@ export class SpeakerListComponent extends BaseViewComponent implements OnInit {
         snackBar: MatSnackBar,
         projectorRepo: ProjectorRepositoryService,
         private route: ActivatedRoute,
-        private DS: DataStoreService,
-        private itemRepo: AgendaRepositoryService,
+        private itemRepo: ItemRepositoryService,
         private op: OperatorService,
         private promptService: PromptService,
         private currentListOfSpeakersService: CurrentListOfSpeakersSlideService,
-        private durationService: DurationService
+        private durationService: DurationService,
+        private userRepository: UserRepositoryService
     ) {
         super(title, translate, snackBar);
         this.isCurrentListOfSpeakers();
@@ -143,12 +143,8 @@ export class SpeakerListComponent extends BaseViewComponent implements OnInit {
      */
     public ngOnInit(): void {
         // load and observe users
-        this.users = new BehaviorSubject(this.DS.getAll(User));
-        this.DS.changeObservable.subscribe(model => {
-            if (model instanceof User) {
-                this.users.next(this.DS.getAll(User));
-            }
-        });
+        this.users = new BehaviorSubject(this.userRepository.getViewModelList());
+        this.userRepository.getViewModelListObservable().subscribe(users => this.users.next(users));
 
         // detect changes in the form
         this.addSpeakerForm.valueChanges.subscribe(formResult => {
@@ -190,10 +186,10 @@ export class SpeakerListComponent extends BaseViewComponent implements OnInit {
         }
 
         this.projectorSubscription = this.currentListOfSpeakersService
-            .getAgendaItemIdObservable(projector)
-            .subscribe(agendaId => {
-                if (agendaId) {
-                    this.setSpeakerList(agendaId);
+            .getAgendaItemObservable(projector)
+            .subscribe(item => {
+                if (item) {
+                    this.setSpeakerList(item.id);
                 }
             });
     }
diff --git a/client/src/app/site/agenda/components/topic-detail/topic-detail.component.html b/client/src/app/site/agenda/components/topic-detail/topic-detail.component.html
index 643c9acdb..ecbb57e08 100644
--- a/client/src/app/site/agenda/components/topic-detail/topic-detail.component.html
+++ b/client/src/app/site/agenda/components/topic-detail/topic-detail.component.html
@@ -24,90 +24,89 @@
     </div>
 </os-head-bar>
 
+<mat-card *ngIf="topic || editTopic"
+        [ngClass]="editTopic ? 'os-form-card' : 'os-card'"
+        class="on-transition-fade">
+    <div *ngIf="!editTopic">
+        <h1>{{ topic.title }}</h1>
+    </div>
+    <div>
+        <span *ngIf="!editTopic">
+            <!-- Render topic text as HTML -->
+            <div [innerHTML]="topic.text"></div>
+        </span>
+    </div>
 
-    <mat-card *ngIf="topic || editTopic"
-            [ngClass]="editTopic ? 'os-form-card' : 'os-card'"
-            class="on-transition-fade">
-        <div *ngIf="!editTopic">
-            <h1>{{ topic.title }}</h1>
-        </div>
+    <div *ngIf="topic.hasAttachments() && !editTopic">
+        <h3>
+            <span translate>Attachments</span>:
+            <mat-list dense>
+                <mat-list-item *ngFor="let file of topic.attachments">
+                    <a [routerLink]="file.downloadUrl" target="_blank">{{ file.title }}</a>
+                </mat-list-item>
+            </mat-list>
+            <!-- TODO: Mediafiles and attachments are not fully implemented -->
+        </h3>
+    </div>
+
+    <form *ngIf="editTopic" [formGroup]="topicForm" (keydown)="onKeyDown($event)" (ngSubmit)="saveTopic()">
         <div>
-            <span *ngIf="!editTopic">
-                <!-- Render topic text as HTML -->
-                <div [innerHTML]="topic.text"></div>
-            </span>
+            <mat-form-field>
+                <input
+                    type="text"
+                    matInput
+                    osAutofocus
+                    required
+                    formControlName="title"
+                    placeholder="{{ 'Title' | translate }}"
+                />
+                <mat-error *ngIf="topicForm.invalid" translate>A name is required</mat-error>
+            </mat-form-field>
         </div>
 
-        <div *ngIf="topic.hasAttachments() && !editTopic">
-            <h3>
-                <span translate>Attachments</span>:
-                <mat-list dense>
-                    <mat-list-item *ngFor="let file of topic.attachments">
-                        <a [routerLink]="file.getDownloadUrl()" target="_blank">{{ file.title }}</a>
-                    </mat-list-item>
-                </mat-list>
-                <!-- TODO: Mediafiles and attachments are not fully implemented -->
-            </h3>
+        <!-- The editor -->
+        <div class="spacer-bottom-20">
+            <h4 translate>Text</h4>
+            <editor formControlName="text" [init]="tinyMceSettings"></editor>
         </div>
 
-        <form *ngIf="editTopic" [formGroup]="topicForm" (keydown)="onKeyDown($event)" (ngSubmit)="saveTopic()">
+        <!-- Attachments -->
+        <os-search-value-selector
+            ngDefaultControl
+            [form]="topicForm"
+            [formControl]="topicForm.get('attachments_id')"
+            [multiple]="true"
+            listname="{{ 'Attachments' | translate }}"
+            [InputListValues]="mediafilesObserver"
+        ></os-search-value-selector>
+
+        <div *ngIf="newTopic">
+            <!-- Visibility -->
             <div>
                 <mat-form-field>
-                    <input
-                        type="text"
-                        matInput
-                        osAutofocus
-                        required
-                        formControlName="title"
-                        placeholder="{{ 'Title' | translate }}"
-                    />
-                    <mat-error *ngIf="topicForm.invalid" translate>A name is required</mat-error>
+                    <mat-select formControlName="agenda_type" placeholder="{{ 'Agenda visibility' | translate }}">
+                        <mat-option *ngFor="let type of itemVisibility" [value]="type.key">
+                            <span>{{ type.name | translate }}</span>
+                        </mat-option>
+                    </mat-select>
                 </mat-form-field>
             </div>
 
-            <!-- The editor -->
-            <div class="spacer-bottom-20">
-                <h4 translate>Text</h4>
-                <editor formControlName="text" [init]="tinyMceSettings"></editor>
+            <!-- Parent item -->
+            <div>
+                <os-search-value-selector
+                    ngDefaultControl
+                    [form]="topicForm"
+                    [formControl]="topicForm.get('agenda_parent_id')"
+                    [multiple]="false"
+                    [includeNone]="true"
+                    listname="{{ 'Parent item' | translate }}"
+                    [InputListValues]="itemObserver"
+                ></os-search-value-selector>
             </div>
-
-            <!-- Attachments -->
-            <os-search-value-selector
-                ngDefaultControl
-                [form]="topicForm"
-                [formControl]="topicForm.get('attachments_id')"
-                [multiple]="true"
-                listname="{{ 'Attachments' | translate }}"
-                [InputListValues]="mediafilesObserver"
-            ></os-search-value-selector>
-
-            <div *ngIf="newTopic">
-                <!-- Visibility -->
-                <div>
-                    <mat-form-field>
-                        <mat-select formControlName="agenda_type" placeholder="{{ 'Agenda visibility' | translate }}">
-                            <mat-option *ngFor="let type of itemVisibility" [value]="type.key">
-                                <span>{{ type.name | translate }}</span>
-                            </mat-option>
-                        </mat-select>
-                    </mat-form-field>
-                </div>
-
-                <!-- Parent item -->
-                <div>
-                    <os-search-value-selector
-                        ngDefaultControl
-                        [form]="topicForm"
-                        [formControl]="topicForm.get('agenda_parent_id')"
-                        [multiple]="false"
-                        [includeNone]="true"
-                        listname="{{ 'Parent item' | translate }}"
-                        [InputListValues]="agendaItemObserver"
-                    ></os-search-value-selector>
-                </div>
-            </div>
-        </form>
-    </mat-card>
+        </div>
+    </form>
+</mat-card>
 
 <mat-menu #topicExtraMenu="matMenu">
     <button mat-menu-item *ngIf="topic" [routerLink]="getSpeakerLink()">
diff --git a/client/src/app/site/agenda/components/topic-detail/topic-detail.component.ts b/client/src/app/site/agenda/components/topic-detail/topic-detail.component.ts
index d9e79e1af..b1b94e8e1 100644
--- a/client/src/app/site/agenda/components/topic-detail/topic-detail.component.ts
+++ b/client/src/app/site/agenda/components/topic-detail/topic-detail.component.ts
@@ -12,10 +12,13 @@ import { TopicRepositoryService } from 'app/core/repositories/agenda/topic-repos
 import { ViewTopic } from '../../models/view-topic';
 import { OperatorService } from 'app/core/core-services/operator.service';
 import { BehaviorSubject } from 'rxjs';
-import { DataStoreService } from 'app/core/core-services/data-store.service';
-import { Mediafile } from 'app/shared/models/mediafiles/mediafile';
-import { Item, itemVisibilityChoices } from 'app/shared/models/agenda/item';
+import { itemVisibilityChoices } from 'app/shared/models/agenda/item';
 import { CreateTopic } from '../../models/create-topic';
+import { Topic } from 'app/shared/models/topics/topic';
+import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile';
+import { ViewItem } from '../../models/view-item';
+import { MediafileRepositoryService } from 'app/core/repositories/mediafiles/mediafile-repository.service';
+import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service';
 
 /**
  * Detail page for topics.
@@ -49,12 +52,12 @@ export class TopicDetailComponent extends BaseViewComponent {
     /**
      * Subject for mediafiles
      */
-    public mediafilesObserver: BehaviorSubject<Mediafile[]>;
+    public mediafilesObserver: BehaviorSubject<ViewMediafile[]>;
 
     /**
      * Subject for agenda items
      */
-    public agendaItemObserver: BehaviorSubject<Item[]>;
+    public itemObserver: BehaviorSubject<ViewItem[]>;
 
     /**
      * Determine visibility states for the agenda that will be created implicitly
@@ -85,22 +88,20 @@ export class TopicDetailComponent extends BaseViewComponent {
         private repo: TopicRepositoryService,
         private promptService: PromptService,
         private operator: OperatorService,
-        private DS: DataStoreService
+        private mediafileRepo: MediafileRepositoryService,
+        private itemRepo: ItemRepositoryService
     ) {
         super(title, translate, matSnackBar);
         this.getTopicByUrl();
         this.createForm();
 
-        this.mediafilesObserver = new BehaviorSubject(this.DS.getAll(Mediafile));
-        this.agendaItemObserver = new BehaviorSubject(this.DS.getAll(Item));
+        this.mediafilesObserver = new BehaviorSubject(this.mediafileRepo.getViewModelList());
+        this.itemObserver = new BehaviorSubject(this.itemRepo.getViewModelList());
 
-        this.DS.changeObservable.subscribe(newModel => {
-            if (newModel instanceof Item) {
-                this.agendaItemObserver.next(DS.getAll(Item));
-            } else if (newModel instanceof Mediafile) {
-                this.mediafilesObserver.next(DS.getAll(Mediafile));
-            }
-        });
+        this.mediafileRepo
+            .getViewModelListObservable()
+            .subscribe(mediafiles => this.mediafilesObserver.next(mediafiles));
+        this.itemRepo.getViewModelListObservable().subscribe(items => this.itemObserver.next(items));
     }
 
     /**
@@ -170,7 +171,7 @@ export class TopicDetailComponent extends BaseViewComponent {
             // creates a new topic
             this.newTopic = true;
             this.editTopic = true;
-            this.topic = new ViewTopic();
+            this.topic = new ViewTopic(new Topic());
         } else {
             // load existing topic
             this.route.params.subscribe(params => {
@@ -205,7 +206,7 @@ export class TopicDetailComponent extends BaseViewComponent {
      */
     public getSpeakerLink(): string {
         if (!this.newTopic && this.topic) {
-            const item = this.repo.getAgendaItem(this.topic.topic);
+            const item = this.topic.getAgendaItem();
             if (item) {
                 return `/agenda/${item.id}/speakers`;
             }
diff --git a/client/src/app/site/agenda/models/view-item.ts b/client/src/app/site/agenda/models/view-item.ts
index 657b79531..063b494bc 100644
--- a/client/src/app/site/agenda/models/view-item.ts
+++ b/client/src/app/site/agenda/models/view-item.ts
@@ -1,11 +1,11 @@
 import { BaseViewModel } from '../../base/base-view-model';
 import { Item } from 'app/shared/models/agenda/item';
-import { AgendaBaseModel } from 'app/shared/models/base/agenda-base-model';
 import { Speaker } from 'app/shared/models/agenda/speaker';
+import { BaseAgendaViewModel } from 'app/site/base/base-agenda-view-model';
 
 export class ViewItem extends BaseViewModel {
     private _item: Item;
-    private _contentObject: AgendaBaseModel;
+    private _contentObject: BaseAgendaViewModel;
 
     /**
      * virtual weight defined by the order in the agenda tree, representing a shortcut to sorting by
@@ -24,7 +24,7 @@ export class ViewItem extends BaseViewModel {
         return this._item;
     }
 
-    public get contentObject(): AgendaBaseModel {
+    public get contentObject(): BaseAgendaViewModel {
         return this._contentObject;
     }
 
@@ -92,8 +92,8 @@ export class ViewItem extends BaseViewModel {
         return this.item ? this.item.parent_id : null;
     }
 
-    public constructor(item: Item, contentObject: AgendaBaseModel) {
-        super();
+    public constructor(item: Item, contentObject: BaseAgendaViewModel) {
+        super('Item');
         this._item = item;
         this._contentObject = contentObject;
     }
@@ -113,7 +113,7 @@ export class ViewItem extends BaseViewModel {
      * @returns the agenda list title as string
      */
     public getListTitle(): string {
-        const contentObject: AgendaBaseModel = this.contentObject;
+        const contentObject: BaseAgendaViewModel = this.contentObject;
         const numberPrefix = this.itemNumber ? `${this.itemNumber} · ` : '';
 
         if (contentObject) {
@@ -123,9 +123,5 @@ export class ViewItem extends BaseViewModel {
         }
     }
 
-    public updateValues(update: Item): void {
-        if (this.id === update.id) {
-            this._item = update;
-        }
-    }
+    public updateDependencies(update: BaseViewModel): void {}
 }
diff --git a/client/src/app/site/agenda/models/view-speaker.ts b/client/src/app/site/agenda/models/view-speaker.ts
index 1002e820a..33e1d2802 100644
--- a/client/src/app/site/agenda/models/view-speaker.ts
+++ b/client/src/app/site/agenda/models/view-speaker.ts
@@ -1,63 +1,62 @@
 import { BaseViewModel } from 'app/site/base/base-view-model';
 import { Speaker, SpeakerState } from 'app/shared/models/agenda/speaker';
-import { User } from 'app/shared/models/users/user';
-import { Selectable } from 'app/shared/components/selectable';
+import { ViewUser } from 'app/site/users/models/view-user';
 
 /**
  * Provides "safe" access to a speaker with all it's components
  */
-export class ViewSpeaker extends BaseViewModel implements Selectable {
+export class ViewSpeaker extends BaseViewModel {
     private _speaker: Speaker;
-    private _user: User;
+    private _user: ViewUser | null;
 
     public get speaker(): Speaker {
         return this._speaker;
     }
 
-    public get user(): User {
+    public get user(): ViewUser {
         return this._user;
     }
 
     public get id(): number {
-        return this.speaker ? this.speaker.id : null;
+        return this.speaker.id;
     }
 
     public get weight(): number {
-        return this.speaker ? this.speaker.weight : null;
+        return this.speaker.weight;
     }
 
     public get marked(): boolean {
-        return this.speaker ? this.speaker.marked : null;
+        return this.speaker.marked;
     }
 
     /**
      * @returns an ISO datetime string or null
      */
     public get begin_time(): string {
-        return this.speaker ? this.speaker.begin_time : null;
+        return this.speaker.begin_time;
     }
 
     /**
      * @returns an ISO datetime string or null
      */
     public get end_time(): string {
-        return this.speaker ? this.speaker.end_time : null;
+        return this.speaker.end_time;
     }
 
     public get state(): SpeakerState {
-        return this.speaker ? this.speaker.state : null;
+        return this.speaker.state;
     }
 
     public get name(): string {
-        return this.user.full_name;
+        return this.user ? this.user.full_name : '';
     }
 
     public get gender(): string {
-        return this.user.gender || '';
+        return this.user ? this.user.gender : '';
     }
 
-    public constructor(speaker?: Speaker, user?: User) {
-        super();
+    public constructor(speaker: Speaker, user?: ViewUser) {
+        super('Speaker');
         this._speaker = speaker;
         this._user = user;
     }
@@ -70,9 +69,5 @@ export class ViewSpeaker extends BaseViewModel implements Selectable {
      * Speaker is not a base model,
      * @param update the incoming update
      */
-    public updateValues(update: Speaker): void {
-        if (this.id === update.id) {
-            this._speaker = update;
-        }
-    }
+    public updateDependencies(update: BaseViewModel): void {}
 }
diff --git a/client/src/app/site/agenda/models/view-topic.ts b/client/src/app/site/agenda/models/view-topic.ts
index a44c68cfb..9c715732d 100644
--- a/client/src/app/site/agenda/models/view-topic.ts
+++ b/client/src/app/site/agenda/models/view-topic.ts
@@ -1,71 +1,112 @@
-import { BaseViewModel } from '../../base/base-view-model';
 import { Topic } from 'app/shared/models/topics/topic';
-import { Mediafile } from 'app/shared/models/mediafiles/mediafile';
-import { Item } from 'app/shared/models/agenda/item';
-import { BaseModel } from 'app/shared/models/base/base-model';
+import { BaseAgendaViewModel } from 'app/site/base/base-agenda-view-model';
+import { SearchRepresentation } from 'app/core/ui-services/search.service';
+import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable';
+import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile';
+import { ViewItem } from './view-item';
+import { BaseViewModel } from 'app/site/base/base-view-model';
 
 /**
  * Provides "safe" access to topic with all it's components
  * @ignore
  */
-export class ViewTopic extends BaseViewModel {
+export class ViewTopic extends BaseAgendaViewModel {
     protected _topic: Topic;
-    private _attachments: Mediafile[];
-    private _agenda_item: Item;
+    private _attachments: ViewMediafile[];
+    private _agendaItem: ViewItem;
 
     public get topic(): Topic {
         return this._topic;
     }
 
-    public get attachments(): Mediafile[] {
+    public get attachments(): ViewMediafile[] {
         return this._attachments;
     }
 
-    public get agenda_item(): Item {
-        return this._agenda_item;
+    public get agendaItem(): ViewItem {
+        return this._agendaItem;
     }
 
     public get id(): number {
-        return this.topic ? this.topic.id : null;
+        return this.topic.id;
     }
 
     public get agenda_item_id(): number {
-        return this.topic ? this.topic.agenda_item_id : null;
+        return this.topic.agenda_item_id;
     }
 
     public get attachments_id(): number[] {
-        return this.topic ? this.topic.attachments_id : null;
+        return this.topic.attachments_id;
     }
 
     public get title(): string {
-        return this.topic ? this.topic.title : null;
+        return this.topic.title;
     }
 
     public get text(): string {
-        return this.topic ? this.topic.text : null;
+        return this.topic.text;
     }
 
-    public constructor(topic?: Topic, attachments?: Mediafile[], item?: Item) {
-        super();
+    public constructor(topic: Topic, attachments?: ViewMediafile[], item?: ViewItem) {
+        super('Topic');
         this._topic = topic;
         this._attachments = attachments;
-        this._agenda_item = item;
+        this._agendaItem = item;
     }
 
     public getTitle(): string {
         return this.title;
     }
 
+    public getAgendaItem(): ViewItem {
+        return this.agendaItem;
+    }
+
+    public getAgendaTitleWithType(): string {
+        // Do not append ' (Topic)' to the title.
+        return this.getAgendaTitle();
+    }
+
+    /**
+     * Formats the category for search
+     *
+     * @override
+     */
+    public formatForSearch(): SearchRepresentation {
+        return [this.title, this.text];
+    }
+
+    public getDetailStateURL(): string {
+        return `/agenda/topics/${this.id}`;
+    }
+
+    /**
+     * Returns the text to be inserted in csv exports
+     * @override
+     */
+    public getCSVExportText(): string {
+        return this.text;
+    }
+
+    public getSlide(): ProjectorElementBuildDeskriptor {
+        throw new Error('TODO');
+    }
+
     public hasAttachments(): boolean {
         return this.attachments && this.attachments.length > 0;
     }
 
-    public updateValues(update: BaseModel): void {
-        if (update instanceof Mediafile) {
-            if (this.topic && this.attachments_id && this.attachments_id.includes(update.id)) {
-                const attachmentIndex = this.attachments.findIndex(mediafile => mediafile.id === update.id);
-                this.attachments[attachmentIndex] = update as Mediafile;
+    public updateDependencies(update: BaseViewModel): void {
+        if (update instanceof ViewMediafile && this.attachments_id.includes(update.id)) {
+            const attachmentIndex = this.attachments.findIndex(mediafile => mediafile.id === update.id);
+            if (attachmentIndex < 0) {
+                this.attachments.push(update);
+            } else {
+                this.attachments[attachmentIndex] = update;
             }
         }
+        if (update instanceof ViewItem && this.agenda_item_id === update.id) {
+            this._agendaItem = update;
+        }
     }
 }
diff --git a/client/src/app/site/agenda/services/agenda-filter-list.service.ts b/client/src/app/site/agenda/services/agenda-filter-list.service.ts
index d67b48e60..a7da0dc1a 100644
--- a/client/src/app/site/agenda/services/agenda-filter-list.service.ts
+++ b/client/src/app/site/agenda/services/agenda-filter-list.service.ts
@@ -4,7 +4,7 @@ import { BaseFilterListService, OsFilter, OsFilterOption } from 'app/core/ui-ser
 import { Item, itemVisibilityChoices } from 'app/shared/models/agenda/item';
 import { ViewItem } from '../models/view-item';
 import { StorageService } from 'app/core/core-services/storage.service';
-import { AgendaRepositoryService } from 'app/core/repositories/agenda/agenda-repository.service';
+import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service';
 
 @Injectable({
     providedIn: 'root'
@@ -19,7 +19,7 @@ export class AgendaFilterListService extends BaseFilterListService<Item, ViewIte
      * @param store
      * @param repo
      */
-    public constructor(store: StorageService, repo: AgendaRepositoryService) {
+    public constructor(store: StorageService, repo: ItemRepositoryService) {
         super(store, repo);
         this.filterOptions = [
             {
diff --git a/client/src/app/site/assignments/assignments.config.ts b/client/src/app/site/assignments/assignments.config.ts
index 08f48105d..a82b10690 100644
--- a/client/src/app/site/assignments/assignments.config.ts
+++ b/client/src/app/site/assignments/assignments.config.ts
@@ -1,6 +1,7 @@
 import { AppConfig } from '../../core/app-config';
 import { Assignment } from '../../shared/models/assignments/assignment';
 import { AssignmentRepositoryService } from 'app/core/repositories/assignments/assignment-repository.service';
+import { ViewAssignment } from './models/view-assignment';
 
 export const AssignmentsAppConfig: AppConfig = {
     name: 'assignments',
@@ -8,6 +9,7 @@ export const AssignmentsAppConfig: AppConfig = {
         {
             collectionString: 'assignments/assignment',
             model: Assignment,
+            viewModel: ViewAssignment,
             searchOrder: 3,
             repository: AssignmentRepositoryService
         }
diff --git a/client/src/app/site/assignments/models/view-assignment.ts b/client/src/app/site/assignments/models/view-assignment.ts
index c400a13b3..9b2a198c2 100644
--- a/client/src/app/site/assignments/models/view-assignment.ts
+++ b/client/src/app/site/assignments/models/view-assignment.ts
@@ -1,14 +1,17 @@
-import { BaseViewModel } from '../../base/base-view-model';
 import { Assignment } from 'app/shared/models/assignments/assignment';
-import { Tag } from 'app/shared/models/core/tag';
-import { User } from 'app/shared/models/users/user';
-import { Item } from 'app/shared/models/agenda/item';
+import { BaseAgendaViewModel } from 'app/site/base/base-agenda-view-model';
+import { SearchRepresentation } from 'app/core/ui-services/search.service';
+import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable';
+import { ViewUser } from 'app/site/users/models/view-user';
+import { ViewItem } from 'app/site/agenda/models/view-item';
+import { ViewTag } from 'app/site/tags/models/view-tag';
+import { BaseViewModel } from 'app/site/base/base-view-model';
 
-export class ViewAssignment extends BaseViewModel {
+export class ViewAssignment extends BaseAgendaViewModel {
     private _assignment: Assignment;
-    private _relatedUser: User[];
-    private _agendaItem: Item;
-    private _tags: Tag[];
+    private _relatedUser: ViewUser[];
+    private _agendaItem: ViewItem;
+    private _tags: ViewTag[];
 
     public get id(): number {
         return this._assignment ? this._assignment.id : null;
@@ -18,15 +21,15 @@ export class ViewAssignment extends BaseViewModel {
         return this._assignment;
     }
 
-    public get candidates(): User[] {
+    public get candidates(): ViewUser[] {
         return this._relatedUser;
     }
 
-    public get agendaItem(): Item {
+    public get agendaItem(): ViewItem {
         return this._agendaItem;
     }
 
-    public get tags(): Tag[] {
+    public get tags(): ViewTag[] {
         return this._tags;
     }
 
@@ -41,17 +44,35 @@ export class ViewAssignment extends BaseViewModel {
         return this.candidates ? this.candidates.length : 0;
     }
 
-    public constructor(assignment: Assignment, relatedUser: User[], agendaItem?: Item, tags?: Tag[]) {
-        super();
+    public constructor(assignment: Assignment, relatedUser?: ViewUser[], agendaItem?: ViewItem, tags?: ViewTag[]) {
+        super('Election');
         this._assignment = assignment;
         this._relatedUser = relatedUser;
         this._agendaItem = agendaItem;
         this._tags = tags;
     }
 
-    public updateValues(): void {}
+    public updateDependencies(update: BaseViewModel): void {
+        console.log('TODO: assignment updateDependencies');
+    }
+
+    public getAgendaItem(): ViewItem {
+        return this.agendaItem;
+    }
 
     public getTitle(): string {
-        return this.assignment ? this.assignment.title : null;
+        return this.assignment.title;
+    }
+
+    public formatForSearch(): SearchRepresentation {
+        throw new Error('TODO');
+    }
+
+    public getDetailStateURL(): string {
+        return 'TODO';
+    }
+
+    public getSlide(): ProjectorElementBuildDeskriptor {
+        throw new Error('TODO');
     }
 }
diff --git a/client/src/app/shared/models/base/agenda-information.ts b/client/src/app/site/base/agenda-information.ts
similarity index 52%
rename from client/src/app/shared/models/base/agenda-information.ts
rename to client/src/app/site/base/agenda-information.ts
index ed81b03d6..2568f10fd 100644
--- a/client/src/app/shared/models/base/agenda-information.ts
+++ b/client/src/app/site/base/agenda-information.ts
@@ -1,4 +1,5 @@
-import { DetailNavigable } from './detail-navigable';
+import { DetailNavigable } from '../../shared/models/base/detail-navigable';
+import { ViewItem } from '../agenda/models/view-item';
 
 /**
  * An Interface for all extra information needed for content objects of items.
@@ -13,4 +14,14 @@ export interface AgendaInformation extends DetailNavigable {
      * Should return the title for the list of speakers view.
      */
     getAgendaTitleWithType(): string;
+
+    /**
+     * An (optional) descriptive text to be exported in the CSV.
+     */
+    getCSVExportText(): string;
+
+    /**
+     * Get access to the agenda item
+     */
+    getAgendaItem(): ViewItem;
 }
diff --git a/client/src/app/shared/models/base/agenda-base-model.ts b/client/src/app/site/base/base-agenda-view-model.ts
similarity index 52%
rename from client/src/app/shared/models/base/agenda-base-model.ts
rename to client/src/app/site/base/base-agenda-view-model.ts
index 25a5cafea..f24e953b4 100644
--- a/client/src/app/shared/models/base/agenda-base-model.ts
+++ b/client/src/app/site/base/base-agenda-view-model.ts
@@ -1,22 +1,13 @@
-import { AgendaInformation } from './agenda-information';
-import { Searchable } from './searchable';
+import { AgendaInformation } from 'app/site/base/agenda-information';
+import { BaseProjectableViewModel } from './base-projectable-view-model';
 import { SearchRepresentation } from 'app/core/ui-services/search.service';
-import { BaseModel } from './base-model';
+import { ViewItem } from '../agenda/models/view-item';
 
 /**
- * A base model for models, that can be content objects in the agenda. Provides title and navigation
- * information for the agenda.
+ * Base view class for projectable models.
  */
-export abstract class AgendaBaseModel extends BaseModel<AgendaBaseModel> implements AgendaInformation, Searchable {
-    /**
-     * A model that can be a content object of an agenda item.
-     * @param collectionString
-     * @param verboseName
-     * @param input
-     */
-    protected constructor(collectionString: string, verboseName: string, input?: any) {
-        super(collectionString, verboseName, input);
-    }
+export abstract class BaseAgendaViewModel extends BaseProjectableViewModel implements AgendaInformation {
+    public abstract getAgendaItem(): ViewItem;
 
     /**
      * @returns the agenda title
@@ -41,14 +32,10 @@ export abstract class AgendaBaseModel extends BaseModel<AgendaBaseModel> impleme
         return '';
     }
 
+    public abstract getDetailStateURL(): string;
+
     /**
      * Should return a string representation of the object, so there can be searched for.
      */
     public abstract formatForSearch(): SearchRepresentation;
-
-    /**
-     * Should return the URL to the detail view. Used for the agenda, that the
-     * user can navigate to the content object.
-     */
-    public abstract getDetailStateURL(): string;
 }
diff --git a/client/src/app/site/base/base-projectable-model.ts b/client/src/app/site/base/base-projectable-view-model.ts
similarity index 58%
rename from client/src/app/site/base/base-projectable-model.ts
rename to client/src/app/site/base/base-projectable-view-model.ts
index 9ba9367c1..9ff9f736b 100644
--- a/client/src/app/site/base/base-projectable-model.ts
+++ b/client/src/app/site/base/base-projectable-view-model.ts
@@ -4,6 +4,10 @@ import { BaseViewModel } from './base-view-model';
 /**
  * Base view class for projectable models.
  */
-export abstract class BaseProjectableModel extends BaseViewModel implements Projectable {
+export abstract class BaseProjectableViewModel extends BaseViewModel implements Projectable {
+    public constructor(verboseName: string) {
+        super(verboseName);
+    }
+
     public abstract getSlide(): ProjectorElementBuildDeskriptor;
 }
diff --git a/client/src/app/site/base/base-view-model.ts b/client/src/app/site/base/base-view-model.ts
index 05b58a057..a5b34e80a 100644
--- a/client/src/app/site/base/base-view-model.ts
+++ b/client/src/app/site/base/base-view-model.ts
@@ -1,6 +1,7 @@
-import { Displayable } from '../../shared/models/base/displayable';
+import { Displayable } from './displayable';
 import { Identifiable } from '../../shared/models/base/identifiable';
-import { Deserializable } from 'app/shared/models/base/deserializable';
+
+export type ViewModelConstructor<T extends BaseViewModel> = new (...args: any[]) => T;
 
 /**
  * Base class for view models. alls view models should have titles.
@@ -11,7 +12,32 @@ export abstract class BaseViewModel implements Displayable, Identifiable {
      */
     public abstract id: number;
 
-    public abstract updateValues(update: Deserializable): void;
+    /**
+     * Children should also have a verbose name for generic display purposes
+     */
+    protected _verboseName: string;
+
+    public constructor(verboseName: string) {
+        this._verboseName = verboseName;
+    }
+
+    /**
+     * Returns the verbose name. Makes it plural by adding a 's'.
+     *
+     * @param plural If the name should be plural
+     * @returns the verbose name of the model
+     */
+    public getVerboseName(plural: boolean = false): string {
+        if (plural) {
+            return this._verboseName + 's'; // I love english. This works for all our models (participantS, electionS,
+            // topicS, motionS, (media)fileS, motion blockS, commentS, personal noteS, projectorS, messageS, countdownS, ...)
+            // Just categorIES need to overwrite this...
+        } else {
+            return this._verboseName;
+        }
+    }
+
+    public abstract updateDependencies(update: BaseViewModel): void;
 
     public abstract getTitle(): string;
 
diff --git a/client/src/app/shared/models/base/displayable.ts b/client/src/app/site/base/displayable.ts
similarity index 100%
rename from client/src/app/shared/models/base/displayable.ts
rename to client/src/app/site/base/displayable.ts
diff --git a/client/src/app/site/base/projectable.ts b/client/src/app/site/base/projectable.ts
index ba350bfa6..0011317fc 100644
--- a/client/src/app/site/base/projectable.ts
+++ b/client/src/app/site/base/projectable.ts
@@ -1,4 +1,4 @@
-import { Displayable } from 'app/shared/models/base/displayable';
+import { Displayable } from 'app/site/base/displayable';
 import { IdentifiableProjectorElement } from 'app/shared/models/core/projector';
 import { SlideOptions } from './slide-options';
 
diff --git a/client/src/app/shared/models/base/searchable.ts b/client/src/app/site/base/searchable.ts
similarity index 88%
rename from client/src/app/shared/models/base/searchable.ts
rename to client/src/app/site/base/searchable.ts
index 0a11a4ef0..a8cbfd8cc 100644
--- a/client/src/app/shared/models/base/searchable.ts
+++ b/client/src/app/site/base/searchable.ts
@@ -1,5 +1,5 @@
-import { DetailNavigable } from './detail-navigable';
 import { SearchRepresentation } from 'app/core/ui-services/search.service';
+import { DetailNavigable } from 'app/shared/models/base/detail-navigable';
 
 /**
  * Asserts, if the given object is searchable.
diff --git a/client/src/app/site/common/common.config.ts b/client/src/app/site/common/common.config.ts
index 58444ffcd..79defba95 100644
--- a/client/src/app/site/common/common.config.ts
+++ b/client/src/app/site/common/common.config.ts
@@ -1,10 +1,18 @@
 import { AppConfig } from '../../core/app-config';
 import { ChatMessage } from '../../shared/models/core/chat-message';
 import { ChatMessageRepositoryService } from 'app/core/repositories/common/chatmessage-repository.service';
+import { ViewChatMessage } from './models/view-chatmessage';
 
 export const CommonAppConfig: AppConfig = {
     name: 'common',
-    models: [{ collectionString: 'core/chat-message', model: ChatMessage, repository: ChatMessageRepositoryService }],
+    models: [
+        {
+            collectionString: 'core/chat-message',
+            model: ChatMessage,
+            viewModel: ViewChatMessage,
+            repository: ChatMessageRepositoryService
+        }
+    ],
     mainMenuEntries: [
         {
             route: '/',
diff --git a/client/src/app/site/common/components/start/start.component.ts b/client/src/app/site/common/components/start/start.component.ts
index 9e59fa02e..442eeb813 100644
--- a/client/src/app/site/common/components/start/start.component.ts
+++ b/client/src/app/site/common/components/start/start.component.ts
@@ -1,9 +1,10 @@
 import { Component, OnInit } from '@angular/core';
 import { Title } from '@angular/platform-browser';
-import { BaseComponent } from 'app/base.component';
 
 import { TranslateService } from '@ngx-translate/core'; // showcase
 
+import { BaseComponent } from 'app/base.component';
+
 // for testing the DS and BaseModel
 import { Config } from 'app/shared/models/core/config';
 import { DataStoreService } from 'app/core/core-services/data-store.service';
diff --git a/client/src/app/site/common/models/view-chatmessage.ts b/client/src/app/site/common/models/view-chatmessage.ts
index d4b1591c6..88b5f0681 100644
--- a/client/src/app/site/common/models/view-chatmessage.ts
+++ b/client/src/app/site/common/models/view-chatmessage.ts
@@ -2,30 +2,28 @@ import { ChatMessage } from 'app/shared/models/core/chat-message';
 import { BaseViewModel } from 'app/site/base/base-view-model';
 
 export class ViewChatMessage extends BaseViewModel {
-    private _message: ChatMessage;
+    private _chatMessage: ChatMessage;
 
     public get chatmessage(): ChatMessage {
-        return this._message ? this._message : null;
+        return this._chatMessage;
     }
 
     public get id(): number {
-        return this.chatmessage ? this.chatmessage.id : null;
+        return this.chatmessage.id;
     }
 
     public get message(): string {
-        return this.chatmessage ? this.chatmessage.message : null;
+        return this.chatmessage.message;
     }
 
     public constructor(message?: ChatMessage) {
-        super();
-        this._message = message;
+        super('Chatmessage');
+        this._chatMessage = message;
     }
 
     public getTitle(): string {
         return 'Chatmessage';
     }
 
-    public updateValues(message: ChatMessage): void {
-        console.log('Update message TODO with vals:', message);
-    }
+    public updateDependencies(message: BaseViewModel): void {}
 }
diff --git a/client/src/app/site/config/components/config-field/config-field.component.ts b/client/src/app/site/config/components/config-field/config-field.component.ts
index 3fa45780d..bafdfc5fd 100644
--- a/client/src/app/site/config/components/config-field/config-field.component.ts
+++ b/client/src/app/site/config/components/config-field/config-field.component.ts
@@ -1,15 +1,15 @@
 import { Component, OnInit, Input, ChangeDetectorRef, ChangeDetectionStrategy } from '@angular/core';
 import { FormGroup, FormBuilder } from '@angular/forms';
 import { Title } from '@angular/platform-browser';
-import { distinctUntilChanged } from 'rxjs/operators';
 
+import { distinctUntilChanged } from 'rxjs/operators';
 import { DateTimeAdapter } from 'ng-pick-datetime';
 import { TranslateService } from '@ngx-translate/core';
 
-import { BaseComponent } from '../../../../base.component';
-import { ConfigRepositoryService } from '../../services/config-repository.service';
+import { BaseComponent } from 'app/base.component';
 import { ParentErrorStateMatcher } from 'app/shared/parent-error-state-matcher';
 import { ViewConfig } from '../../models/view-config';
+import { ConfigRepositoryService } from 'app/core/repositories/config/config-repository.service';
 
 /**
  * List view for the categories.
diff --git a/client/src/app/site/config/components/config-list/config-list.component.ts b/client/src/app/site/config/components/config-list/config-list.component.ts
index 25175a68d..b6f0b9b79 100644
--- a/client/src/app/site/config/components/config-list/config-list.component.ts
+++ b/client/src/app/site/config/components/config-list/config-list.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { Title } from '@angular/platform-browser';
 import { TranslateService } from '@ngx-translate/core';
-import { ConfigRepositoryService, ConfigGroup } from '../../services/config-repository.service';
+import { ConfigRepositoryService, ConfigGroup } from '../../../../core/repositories/config/config-repository.service';
 import { BaseComponent } from '../../../../base.component';
 
 /**
diff --git a/client/src/app/site/config/config.config.ts b/client/src/app/site/config/config.config.ts
index 35edb2eab..f31a79e08 100644
--- a/client/src/app/site/config/config.config.ts
+++ b/client/src/app/site/config/config.config.ts
@@ -1,10 +1,13 @@
 import { AppConfig } from '../../core/app-config';
 import { Config } from '../../shared/models/core/config';
-import { ConfigRepositoryService } from './services/config-repository.service';
+import { ConfigRepositoryService } from '../../core/repositories/config/config-repository.service';
+import { ViewConfig } from './models/view-config';
 
 export const ConfigAppConfig: AppConfig = {
     name: 'settings',
-    models: [{ collectionString: 'core/config', model: Config, repository: ConfigRepositoryService }],
+    models: [
+        { collectionString: 'core/config', model: Config, viewModel: ViewConfig, repository: ConfigRepositoryService }
+    ],
     mainMenuEntries: [
         {
             route: '/settings',
diff --git a/client/src/app/site/config/models/view-config.ts b/client/src/app/site/config/models/view-config.ts
index 3957f2d33..c6e653015 100644
--- a/client/src/app/site/config/models/view-config.ts
+++ b/client/src/app/site/config/models/view-config.ts
@@ -94,7 +94,7 @@ export class ViewConfig extends BaseViewModel {
     }
 
     public constructor(config: Config) {
-        super();
+        super('Config');
         this._config = config;
     }
 
@@ -102,9 +102,7 @@ export class ViewConfig extends BaseViewModel {
         return this.label;
     }
 
-    public updateValues(update: Config): void {
-        this._config = update;
-    }
+    public updateDependencies(update: BaseViewModel): void {}
 
     /**
      * Returns the time this config field needs to debounce before sending a request to the server.
diff --git a/client/src/app/site/history/components/history-list/history-list.component.ts b/client/src/app/site/history/components/history-list/history-list.component.ts
index 8e7b93685..0a98a7521 100644
--- a/client/src/app/site/history/components/history-list/history-list.component.ts
+++ b/client/src/app/site/history/components/history-list/history-list.component.ts
@@ -2,16 +2,15 @@ import { Component, OnInit } from '@angular/core';
 import { Title } from '@angular/platform-browser';
 import { MatSnackBar } from '@angular/material';
 import { Router } from '@angular/router';
-import { Subject } from 'rxjs';
 
+import { Subject } from 'rxjs';
 import { TranslateService } from '@ngx-translate/core';
 
 import { ListViewBaseComponent } from 'app/site/base/list-view-base';
 import { HistoryRepositoryService } from 'app/core/repositories/history/history-repository.service';
-import { DataStoreService } from 'app/core/core-services/data-store.service';
 import { isDetailNavigable } from 'app/shared/models/base/detail-navigable';
-
 import { ViewHistory } from '../../models/view-history';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
 
 /**
  * A list view for the history.
@@ -42,7 +41,7 @@ export class HistoryListComponent extends ListViewBaseComponent<ViewHistory> imp
         translate: TranslateService,
         matSnackBar: MatSnackBar,
         private repo: HistoryRepositoryService,
-        private DS: DataStoreService,
+        private viewModelStore: ViewModelStoreService,
         private router: Router
     ) {
         super(titleService, translate, matSnackBar);
@@ -89,7 +88,7 @@ export class HistoryListComponent extends ListViewBaseComponent<ViewHistory> imp
      * @returns the title of an old element or null if it could not be found
      */
     public getElementInfo(history: ViewHistory): string {
-        const oldElementTitle = this.repo.getOldModelInfo(history.getCollectionString(), history.getModelID());
+        const oldElementTitle = this.repo.getOldModelInfo(history.getCollectionString(), history.getModelId());
 
         if (oldElementTitle) {
             return oldElementTitle;
@@ -104,22 +103,19 @@ export class HistoryListComponent extends ListViewBaseComponent<ViewHistory> imp
      *
      * @param history Represents the selected element
      */
-    public onClickRow(history: ViewHistory): void {
-        this.repo.browseHistory(history).then(() => {
-            const element = this.DS.get(history.getCollectionString(), history.getModelID());
-            let message = this.translate.instant('Temporarily reset OpenSlides to the state from ');
-            message += history.getLocaleString('DE-de') + '. ';
+    public async onClickRow(history: ViewHistory): Promise<void> {
+        await this.repo.browseHistory(history);
+        const element = this.viewModelStore.get(history.getCollectionString(), history.getModelId());
+        let message = this.translate.instant('Temporarily reset OpenSlides to the state from ');
+        message += history.getLocaleString('DE-de') + '. ';
 
-            if (isDetailNavigable(element)) {
-                message += this.translate.instant(
-                    'You will be redirected to the detail state of the last changed item.'
-                );
-                this.raiseError(message);
-                this.router.navigate([element.getDetailStateURL()]);
-            } else {
-                this.raiseError(message);
-            }
-        });
+        if (isDetailNavigable(element)) {
+            message += this.translate.instant('You will be redirected to the detail state of the last changed item.');
+            this.raiseError(message);
+            this.router.navigate([element.getDetailStateURL()]);
+        } else {
+            this.raiseError(message);
+        }
     }
 
     /**
diff --git a/client/src/app/site/history/history.config.ts b/client/src/app/site/history/history.config.ts
index c802ef518..87ac84944 100644
--- a/client/src/app/site/history/history.config.ts
+++ b/client/src/app/site/history/history.config.ts
@@ -1,6 +1,7 @@
 import { AppConfig } from '../../core/app-config';
 import { History } from 'app/shared/models/core/history';
 import { HistoryRepositoryService } from 'app/core/repositories/history/history-repository.service';
+import { ViewHistory } from './models/view-history';
 
 /**
  * Config object for history.
@@ -8,7 +9,14 @@ import { HistoryRepositoryService } from 'app/core/repositories/history/history-
  */
 export const HistoryAppConfig: AppConfig = {
     name: 'history',
-    models: [{ collectionString: 'core/history', model: History, repository: HistoryRepositoryService }],
+    models: [
+        {
+            collectionString: 'core/history',
+            model: History,
+            viewModel: ViewHistory,
+            repository: HistoryRepositoryService
+        }
+    ],
     mainMenuEntries: [
         {
             route: '/history',
diff --git a/client/src/app/site/history/models/view-history.ts b/client/src/app/site/history/models/view-history.ts
index 846710b4b..930b77c5d 100644
--- a/client/src/app/site/history/models/view-history.ts
+++ b/client/src/app/site/history/models/view-history.ts
@@ -1,7 +1,6 @@
 import { BaseViewModel } from 'app/site/base/base-view-model';
 import { History } from 'app/shared/models/core/history';
-import { User } from 'app/shared/models/users/user';
-import { BaseModel } from 'app/shared/models/base/base-model';
+import { ViewUser } from 'app/site/users/models/view-user';
 
 /**
  * View model for history objects
@@ -16,19 +15,19 @@ export class ViewHistory extends BaseViewModel {
      * Real representation of the user who altered the history.
      * Determined from `History.user_id`
      */
-    private _user: User;
+    private _user: ViewUser | null;
 
     /**
      * Read the history property
      */
     public get history(): History {
-        return this._history ? this._history : null;
+        return this._history;
     }
 
     /**
      * Read the user property
      */
-    public get user(): User {
+    public get user(): ViewUser {
         return this._user ? this._user : null;
     }
 
@@ -39,7 +38,7 @@ export class ViewHistory extends BaseViewModel {
      * @returns the ID as number
      */
     public get id(): number {
-        return this.history ? this.history.id : null;
+        return this.history.id;
     }
 
     /**
@@ -48,7 +47,7 @@ export class ViewHistory extends BaseViewModel {
      * @returns the element ID as String
      */
     public get element_id(): string {
-        return this.history ? this.history.element_id : null;
+        return this.history.element_id;
     }
 
     /**
@@ -57,7 +56,7 @@ export class ViewHistory extends BaseViewModel {
      * @returns a string with the information to the history object
      */
     public get information(): string {
-        return this.history ? this.history.information : null;
+        return this.history.information;
     }
 
     /**
@@ -66,7 +65,7 @@ export class ViewHistory extends BaseViewModel {
      * @returns the unix timestamp as number
      */
     public get now(): string {
-        return this.history ? this.history.now : null;
+        return this.history.now;
     }
 
     /**
@@ -75,8 +74,8 @@ export class ViewHistory extends BaseViewModel {
      * @param history the real history BaseModel
      * @param user the real user BaseModel
      */
-    public constructor(history?: History, user?: User) {
-        super();
+    public constructor(history: History, user?: ViewUser) {
+        super('History');
         this._history = history;
         this._user = user;
     }
@@ -88,7 +87,7 @@ export class ViewHistory extends BaseViewModel {
      * @returns a human readable kind of time and date representation
      */
     public getLocaleString(locale: string): string {
-        return this.history.date ? this.history.date.toLocaleString(locale) : null;
+        return this.history.date.toLocaleString(locale);
     }
 
     /**
@@ -103,7 +102,7 @@ export class ViewHistory extends BaseViewModel {
      * Extract the models ID from the elementID
      * @returns a model id
      */
-    public getModelID(): number {
+    public getModelId(): number {
         return +this.element_id.split(':')[1];
     }
 
@@ -114,7 +113,7 @@ export class ViewHistory extends BaseViewModel {
      * @returns history.getTitle which returns the element_id
      */
     public getTitle(): string {
-        return this.history.getTitle();
+        return this.element_id;
     }
 
     /**
@@ -122,10 +121,8 @@ export class ViewHistory extends BaseViewModel {
      *
      * @param update potentially the new values for history or it's components.
      */
-    public updateValues(update: BaseModel): void {
-        if (update instanceof History && this.history.id === update.id) {
-            this._history = update;
-        } else if (this.history && update instanceof User && this.history.user_id === update.id) {
+    public updateDependencies(update: BaseViewModel): void {
+        if (update instanceof ViewUser && this.history.user_id === update.id) {
             this._user = update;
         }
     }
diff --git a/client/src/app/site/mediafiles/mediafile.config.ts b/client/src/app/site/mediafiles/mediafile.config.ts
index 694b14701..07719ef83 100644
--- a/client/src/app/site/mediafiles/mediafile.config.ts
+++ b/client/src/app/site/mediafiles/mediafile.config.ts
@@ -1,6 +1,7 @@
 import { AppConfig } from '../../core/app-config';
 import { Mediafile } from '../../shared/models/mediafiles/mediafile';
 import { MediafileRepositoryService } from 'app/core/repositories/mediafiles/mediafile-repository.service';
+import { ViewMediafile } from './models/view-mediafile';
 
 export const MediafileAppConfig: AppConfig = {
     name: 'mediafiles',
@@ -8,6 +9,7 @@ export const MediafileAppConfig: AppConfig = {
         {
             collectionString: 'mediafiles/mediafile',
             model: Mediafile,
+            viewModel: ViewMediafile,
             searchOrder: 5,
             repository: MediafileRepositoryService
         }
diff --git a/client/src/app/site/mediafiles/models/view-mediafile.ts b/client/src/app/site/mediafiles/models/view-mediafile.ts
index 7c04c473c..dc13f8dcc 100644
--- a/client/src/app/site/mediafiles/models/view-mediafile.ts
+++ b/client/src/app/site/mediafiles/models/view-mediafile.ts
@@ -1,56 +1,55 @@
 import { BaseViewModel } from '../../base/base-view-model';
 import { Mediafile } from 'app/shared/models/mediafiles/mediafile';
-import { User } from 'app/shared/models/users/user';
+import { Searchable } from 'app/site/base/searchable';
+import { SearchRepresentation } from 'app/core/ui-services/search.service';
+import { ViewUser } from 'app/site/users/models/view-user';
 
-export class ViewMediafile extends BaseViewModel {
+export class ViewMediafile extends BaseViewModel implements Searchable {
     private _mediafile: Mediafile;
-    private _uploader: User;
-
-    public get id(): number {
-        return this._mediafile ? this._mediafile.id : null;
-    }
+    private _uploader: ViewUser;
 
     public get mediafile(): Mediafile {
         return this._mediafile;
     }
 
-    public get uploader(): User {
+    public get uploader(): ViewUser {
         return this._uploader;
     }
 
+    public get id(): number {
+        return this.mediafile.id;
+    }
+
+    public get uploader_id(): number {
+        return this.mediafile.uploader_id;
+    }
+
     public get title(): string {
-        return this.mediafile ? this.mediafile.title : null;
+        return this.mediafile.title;
     }
 
     public get size(): string {
-        return this.mediafile ? this.mediafile.filesize : null;
+        return this.mediafile.filesize;
     }
 
     public get type(): string {
-        return this.mediafile && this.mediafile.mediafile ? this.mediafile.mediafile.type : null;
+        return this.mediafile.mediafile.type;
     }
 
     public get prefix(): string {
-        return this.mediafile ? this.mediafile.media_url_prefix : null;
+        return this.mediafile.media_url_prefix;
     }
 
     public get hidden(): boolean {
-        return this.mediafile ? this.mediafile.hidden : null;
+        return this.mediafile.hidden;
     }
 
     public get fileName(): string {
-        return this.mediafile && this.mediafile.mediafile ? this.mediafile.mediafile.name : null;
+        return this.mediafile.mediafile.name;
     }
 
     public get downloadUrl(): string {
-        return this.mediafile ? this.mediafile.getDownloadUrl() : null;
-    }
-
-    /**
-     * @returns the file type of the associated media file.
-     */
-    public get fileType(): string {
-        return this.mediafile ? this.mediafile.mediafile.type : null;
+        return this.mediafile.downloadUrl;
     }
 
     /**
@@ -59,11 +58,11 @@ export class ViewMediafile extends BaseViewModel {
      * TODO Which is the expected behavior for 'no file'?
      */
     public get is_hidden(): boolean {
-        return this.mediafile ? this.mediafile.hidden : true;
+        return this.mediafile.hidden;
     }
 
-    public constructor(mediafile?: Mediafile, uploader?: User) {
-        super();
+    public constructor(mediafile: Mediafile, uploader?: ViewUser) {
+        super('Mediafile');
         this._mediafile = mediafile;
         this._uploader = uploader;
     }
@@ -72,6 +71,14 @@ export class ViewMediafile extends BaseViewModel {
         return this.title;
     }
 
+    public formatForSearch(): SearchRepresentation {
+        return [this.title];
+    }
+
+    public getDetailStateURL(): string {
+        throw new Error('TODO');
+    }
+
     /**
      * Determine if the file is an image
      *
@@ -129,10 +136,8 @@ export class ViewMediafile extends BaseViewModel {
         return this.isPdf() || this.isImage() || this.isVideo();
     }
 
-    public updateValues(update: Mediafile): void {
-        if (update instanceof Mediafile && this.mediafile.id === update.id) {
-            this._mediafile = update;
-        } else if (update instanceof User && this.uploader.id === update.id) {
+    public updateDependencies(update: BaseViewModel): void {
+        if (update instanceof ViewUser && this.uploader_id === update.id) {
             this._uploader = update;
         }
     }
diff --git a/client/src/app/site/mediafiles/services/mediafile-filter.service.ts b/client/src/app/site/mediafiles/services/mediafile-filter.service.ts
index bf673de86..0e27f2130 100644
--- a/client/src/app/site/mediafiles/services/mediafile-filter.service.ts
+++ b/client/src/app/site/mediafiles/services/mediafile-filter.service.ts
@@ -22,7 +22,7 @@ export class MediafileFilterListService extends BaseFilterListService<Mediafile,
             ]
         },
         {
-            property: 'fileType',
+            property: 'type',
             label: 'Is PDF',
             options: [
                 {
diff --git a/client/src/app/site/motions/components/manage-submitters/manage-submitters.component.spec.ts b/client/src/app/site/motions/components/manage-submitters/manage-submitters.component.spec.ts
index 012e6ace1..902f3083b 100644
--- a/client/src/app/site/motions/components/manage-submitters/manage-submitters.component.spec.ts
+++ b/client/src/app/site/motions/components/manage-submitters/manage-submitters.component.spec.ts
@@ -4,6 +4,7 @@ import { ManageSubmittersComponent } from './manage-submitters.component';
 import { E2EImportsModule } from 'e2e-imports.module';
 import { ViewChild, Component } from '@angular/core';
 import { ViewMotion } from '../../models/view-motion';
+import { Motion } from 'app/shared/models/motions/motion';
 
 describe('ManageSubmittersComponent', () => {
     @Component({
@@ -31,7 +32,7 @@ describe('ManageSubmittersComponent', () => {
     });
 
     it('should create', () => {
-        const motion = new ViewMotion();
+        const motion = new ViewMotion(new Motion());
         hostComponent.manageSubmitterComponent.motion = motion;
 
         hostFixture.detectChanges();
diff --git a/client/src/app/site/motions/components/manage-submitters/manage-submitters.component.ts b/client/src/app/site/motions/components/manage-submitters/manage-submitters.component.ts
index b27c30085..68832fafb 100644
--- a/client/src/app/site/motions/components/manage-submitters/manage-submitters.component.ts
+++ b/client/src/app/site/motions/components/manage-submitters/manage-submitters.component.ts
@@ -7,11 +7,13 @@ import { TranslateService } from '@ngx-translate/core';
 import { BehaviorSubject, Observable } from 'rxjs';
 
 import { BaseViewComponent } from 'app/site/base/base-view';
-import { DataStoreService } from 'app/core/core-services/data-store.service';
 import { LocalPermissionsService } from '../../services/local-permissions.service';
 import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service';
 import { User } from 'app/shared/models/users/user';
 import { ViewMotion } from '../../models/view-motion';
+import { ViewUser } from 'app/site/users/models/view-user';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
+import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service';
 
 /**
  * Component for the motion comments view
@@ -31,7 +33,7 @@ export class ManageSubmittersComponent extends BaseViewComponent {
     /**
      * Keep all users to display them.
      */
-    public users: BehaviorSubject<User[]>;
+    public users: BehaviorSubject<ViewUser[]>;
 
     /**
      * The form to add new submitters
@@ -41,13 +43,13 @@ export class ManageSubmittersComponent extends BaseViewComponent {
     /**
      * The current list of submitters.
      */
-    public readonly editSubmitterSubject: BehaviorSubject<User[]> = new BehaviorSubject([]);
+    public readonly editSubmitterSubject: BehaviorSubject<ViewUser[]> = new BehaviorSubject([]);
 
     /**
      * The observable from editSubmitterSubject. Fixing this value is a performance boost, because
      * it is just set one time at loading instead of calling .asObservable() every time.
      */
-    public editSubmitterObservable: Observable<User[]>;
+    public editSubmitterObservable: Observable<ViewUser[]>;
 
     /**
      * Saves, if the users edits the note.
@@ -61,15 +63,16 @@ export class ManageSubmittersComponent extends BaseViewComponent {
      * @param translate
      * @param matSnackBar
      * @param DS
-     * @param repo
+     * @param motionRepository
      * @param perms permission checks for the motion
      */
     public constructor(
         title: Title,
         translate: TranslateService,
         matSnackBar: MatSnackBar,
-        private DS: DataStoreService,
-        private repo: MotionRepositoryService,
+        private viewModelStore: ViewModelStoreService,
+        private motionRepository: MotionRepositoryService,
+        private userRepository: UserRepositoryService,
         public perms: LocalPermissionsService
     ) {
         super(title, translate, matSnackBar);
@@ -78,12 +81,8 @@ export class ManageSubmittersComponent extends BaseViewComponent {
         this.editSubmitterObservable = this.editSubmitterSubject.asObservable();
 
         // get all users for the submitter add form
-        this.users = new BehaviorSubject(this.DS.getAll(User));
-        this.DS.changeObservable.subscribe(model => {
-            if (model instanceof User) {
-                this.users.next(this.DS.getAll(User));
-            }
-        });
+        this.users = new BehaviorSubject<ViewUser[]>(this.userRepository.getViewModelList());
+        this.userRepository.getViewModelListObservable().subscribe(users => this.users.next(users));
 
         // detect changes in the form
         this.addSubmitterForm.valueChanges.subscribe(formResult => {
@@ -106,7 +105,7 @@ export class ManageSubmittersComponent extends BaseViewComponent {
      * Save the submitters
      */
     public onSave(): void {
-        this.repo
+        this.motionRepository
             .setSubmitters(this.motion, this.editSubmitterSubject.getValue())
             .then(() => (this.isEditMode = false), this.raiseError);
     }
@@ -126,7 +125,7 @@ export class ManageSubmittersComponent extends BaseViewComponent {
     public addNewSubmitter(userId: number): void {
         const submitters = this.editSubmitterSubject.getValue();
         if (!submitters.map(u => u.id).includes(userId)) {
-            submitters.push(this.DS.get(User, userId));
+            submitters.push(this.viewModelStore.get(ViewUser, userId));
             this.editSubmitterSubject.next(submitters);
         }
         this.addSubmitterForm.reset();
@@ -137,7 +136,7 @@ export class ManageSubmittersComponent extends BaseViewComponent {
      *
      * @param users The new, sorted users.
      */
-    public onSortingChange(users: User[]): void {
+    public onSortingChange(users: ViewUser[]): void {
         this.editSubmitterSubject.next(users);
     }
 
diff --git a/client/src/app/site/motions/components/motion-block-list/motion-block-list.component.ts b/client/src/app/site/motions/components/motion-block-list/motion-block-list.component.ts
index 8209a8238..22f82e155 100644
--- a/client/src/app/site/motions/components/motion-block-list/motion-block-list.component.ts
+++ b/client/src/app/site/motions/components/motion-block-list/motion-block-list.component.ts
@@ -9,12 +9,12 @@ import { TranslateService } from '@ngx-translate/core';
 
 import { ListViewBaseComponent } from 'app/site/base/list-view-base';
 import { MotionBlock } from 'app/shared/models/motions/motion-block';
-import { Item, itemVisibilityChoices } from 'app/shared/models/agenda/item';
-import { DataStoreService } from 'app/core/core-services/data-store.service';
+import { itemVisibilityChoices } from 'app/shared/models/agenda/item';
 import { MotionBlockRepositoryService } from 'app/core/repositories/motions/motion-block-repository.service';
 import { ViewMotionBlock } from '../../models/view-motion-block';
-import { AgendaRepositoryService } from 'app/core/repositories/agenda/agenda-repository.service';
+import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service';
 import { PromptService } from 'app/core/ui-services/prompt.service';
+import { ViewItem } from 'app/site/agenda/models/view-item';
 
 /**
  * Table for the motion blocks
@@ -38,7 +38,7 @@ export class MotionBlockListComponent extends ListViewBaseComponent<ViewMotionBl
     /**
      * Holds the agenda items to select the parent item
      */
-    public items: BehaviorSubject<Item[]>;
+    public items: BehaviorSubject<ViewItem[]>;
 
     /**
      * Determine the default agenda visibility
@@ -71,10 +71,10 @@ export class MotionBlockListComponent extends ListViewBaseComponent<ViewMotionBl
         private router: Router,
         private route: ActivatedRoute,
         private repo: MotionBlockRepositoryService,
-        private agendaRepo: AgendaRepositoryService,
-        private DS: DataStoreService,
+        private agendaRepo: ItemRepositoryService,
         private formBuilder: FormBuilder,
-        private promptService: PromptService
+        private promptService: PromptService,
+        private itemRepo: ItemRepositoryService
     ) {
         super(titleService, translate, matSnackBar);
 
@@ -92,13 +92,8 @@ export class MotionBlockListComponent extends ListViewBaseComponent<ViewMotionBl
         super.setTitle('Motion Blocks');
         this.initTable();
 
-        this.items = new BehaviorSubject(this.DS.getAll(Item));
-
-        this.DS.changeObservable.subscribe(model => {
-            if (model instanceof Item) {
-                this.items.next(this.DS.getAll(Item));
-            }
-        });
+        this.items = new BehaviorSubject(this.itemRepo.getViewModelList());
+        this.itemRepo.getViewModelListObservable().subscribe(items => this.items.next(items));
 
         this.repo.getViewModelListObservable().subscribe(newMotionblocks => {
             newMotionblocks.sort((a, b) => (a > b ? 1 : -1));
diff --git a/client/src/app/site/motions/components/motion-change-recommendation/motion-change-recommendation.component.spec.ts b/client/src/app/site/motions/components/motion-change-recommendation/motion-change-recommendation.component.spec.ts
index 0ef7ede7f..12468e1cd 100644
--- a/client/src/app/site/motions/components/motion-change-recommendation/motion-change-recommendation.component.spec.ts
+++ b/client/src/app/site/motions/components/motion-change-recommendation/motion-change-recommendation.component.spec.ts
@@ -7,13 +7,13 @@ import {
 import { E2EImportsModule } from '../../../../../e2e-imports.module';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
 import { ModificationType } from 'app/core/ui-services/diff.service';
-import { ViewChangeReco } from '../../models/view-change-reco';
+import { ViewMotionChangeRecommendation } from '../../models/view-change-recommendation';
 
 describe('MotionChangeRecommendationComponent', () => {
     let component: MotionChangeRecommendationComponent;
     let fixture: ComponentFixture<MotionChangeRecommendationComponent>;
 
-    const changeReco = <ViewChangeReco>{
+    const changeReco = <ViewMotionChangeRecommendation>{
         line_from: 1,
         line_to: 2,
         type: ModificationType.TYPE_REPLACEMENT,
diff --git a/client/src/app/site/motions/components/motion-change-recommendation/motion-change-recommendation.component.ts b/client/src/app/site/motions/components/motion-change-recommendation/motion-change-recommendation.component.ts
index fd71e309a..78d93dd05 100644
--- a/client/src/app/site/motions/components/motion-change-recommendation/motion-change-recommendation.component.ts
+++ b/client/src/app/site/motions/components/motion-change-recommendation/motion-change-recommendation.component.ts
@@ -7,7 +7,7 @@ import { TranslateService } from '@ngx-translate/core';
 
 import { LineRange, ModificationType } from 'app/core/ui-services/diff.service';
 import { ChangeRecommendationRepositoryService } from 'app/core/repositories/motions/change-recommendation-repository.service';
-import { ViewChangeReco } from '../../models/view-change-reco';
+import { ViewMotionChangeRecommendation } from '../../models/view-change-recommendation';
 import { BaseViewComponent } from '../../../base/base-view';
 
 /**
@@ -17,7 +17,7 @@ export interface MotionChangeRecommendationComponentData {
     editChangeRecommendation: boolean;
     newChangeRecommendation: boolean;
     lineRange: LineRange;
-    changeRecommendation: ViewChangeReco;
+    changeRecommendation: ViewMotionChangeRecommendation;
 }
 
 /**
@@ -58,7 +58,7 @@ export class MotionChangeRecommendationComponent extends BaseViewComponent {
     /**
      * The change recommendation
      */
-    public changeReco: ViewChangeReco;
+    public changeReco: ViewMotionChangeRecommendation;
 
     /**
      * The line range affected by this change recommendation
diff --git a/client/src/app/site/motions/components/motion-comments/motion-comments.component.ts b/client/src/app/site/motions/components/motion-comments/motion-comments.component.ts
index d6e3bdb94..0d79a6363 100644
--- a/client/src/app/site/motions/components/motion-comments/motion-comments.component.ts
+++ b/client/src/app/site/motions/components/motion-comments/motion-comments.component.ts
@@ -78,7 +78,7 @@ export class MotionCommentsComponent extends BaseViewComponent {
         super(titleService, translate, matSnackBar);
 
         this.commentRepo.getViewModelListObservable().subscribe(sections => this.setSections(sections));
-        this.operator.getObservable().subscribe(() => this.setSections(this.commentRepo.getViewModelList()));
+        this.operator.getUserObservable().subscribe(() => this.setSections(this.commentRepo.getViewModelList()));
     }
 
     /**
diff --git a/client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.spec.ts b/client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.spec.ts
index 56f092561..ab29338c6 100644
--- a/client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.spec.ts
+++ b/client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.spec.ts
@@ -3,10 +3,11 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { E2EImportsModule } from '../../../../../e2e-imports.module';
 import { Component } from '@angular/core';
 import { ViewMotion } from '../../models/view-motion';
-import { ViewChangeReco } from '../../models/view-change-reco';
 import { MotionDetailDiffComponent } from './motion-detail-diff.component';
 import { MotionDetailOriginalChangeRecommendationsComponent } from '../motion-detail-original-change-recommendations/motion-detail-original-change-recommendations.component';
 import { ViewUnifiedChange } from '../../models/view-unified-change';
+import { Motion } from 'app/shared/models/motions/motion';
+import { ViewMotionChangeRecommendation } from '../../models/view-change-recommendation';
 
 @Component({
     template: `
@@ -22,11 +23,11 @@ import { ViewUnifiedChange } from '../../models/view-unified-change';
 })
 class TestHostComponent {
     public motion: ViewMotion;
-    public changes: ViewChangeReco[];
+    public changes: ViewMotionChangeRecommendation[];
     public scrollToChange: ViewUnifiedChange = null;
 
     public constructor() {
-        this.motion = new ViewMotion();
+        this.motion = new ViewMotion(new Motion());
         this.changes = [];
     }
 
diff --git a/client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.ts b/client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.ts
index fa129fadb..833deb168 100644
--- a/client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.ts
+++ b/client/src/app/site/motions/components/motion-detail-diff/motion-detail-diff.component.ts
@@ -8,7 +8,7 @@ import { LineNumberingMode, ViewMotion } from '../../models/view-motion';
 import { ViewUnifiedChange, ViewUnifiedChangeType } from '../../models/view-unified-change';
 import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service';
 import { LineRange, ModificationType } from 'app/core/ui-services/diff.service';
-import { ViewChangeReco } from '../../models/view-change-reco';
+import { ViewMotionChangeRecommendation } from '../../models/view-change-recommendation';
 import { ChangeRecommendationRepositoryService } from 'app/core/repositories/motions/change-recommendation-repository.service';
 import {
     MotionChangeRecommendationComponent,
@@ -240,7 +240,7 @@ export class MotionDetailDiffComponent extends BaseViewComponent implements Afte
      *
      * @param change
      */
-    public getRecommendationTypeName(change: ViewChangeReco): string {
+    public getRecommendationTypeName(change: ViewMotionChangeRecommendation): string {
         switch (change.type) {
             case ModificationType.TYPE_REPLACEMENT:
                 return 'Replacement';
@@ -257,10 +257,10 @@ export class MotionDetailDiffComponent extends BaseViewComponent implements Afte
      * Sets a change recommendation to accepted or rejected.
      * The template has to make sure only to pass change recommendations to this method.
      *
-     * @param {ViewChangeReco} change
+     * @param {ViewMotionChangeRecommendation} change
      * @param {string} value
      */
-    public async setAcceptanceValue(change: ViewChangeReco, value: string): Promise<void> {
+    public async setAcceptanceValue(change: ViewMotionChangeRecommendation, value: string): Promise<void> {
         try {
             if (value === 'accepted') {
                 await this.recoRepo.setAccepted(change);
@@ -276,10 +276,10 @@ export class MotionDetailDiffComponent extends BaseViewComponent implements Afte
     /**
      * Sets if a change recommendation is internal or not
      *
-     * @param {ViewChangeReco} change
+     * @param {ViewMotionChangeRecommendation} change
      * @param {boolean} internal
      */
-    public setInternal(change: ViewChangeReco, internal: boolean): void {
+    public setInternal(change: ViewMotionChangeRecommendation, internal: boolean): void {
         this.recoRepo.setInternal(change, internal).then(null, this.raiseError);
     }
 
@@ -287,10 +287,10 @@ export class MotionDetailDiffComponent extends BaseViewComponent implements Afte
      * Deletes a change recommendation.
      * The template has to make sure only to pass change recommendations to this method.
      *
-     * @param {ViewChangeReco} reco
+     * @param {ViewMotionChangeRecommendation} reco
      * @param {MouseEvent} $event
      */
-    public deleteChangeRecommendation(reco: ViewChangeReco, $event: MouseEvent): void {
+    public deleteChangeRecommendation(reco: ViewMotionChangeRecommendation, $event: MouseEvent): void {
         $event.stopPropagation();
         $event.preventDefault();
         this.recoRepo.delete(reco).then(null, this.raiseError);
@@ -300,10 +300,10 @@ export class MotionDetailDiffComponent extends BaseViewComponent implements Afte
      * Edits a change recommendation.
      * The template has to make sure only to pass change recommendations to this method.
      *
-     * @param {ViewChangeReco} reco
+     * @param {ViewMotionChangeRecommendation} reco
      * @param {MouseEvent} $event
      */
-    public editChangeRecommendation(reco: ViewChangeReco, $event: MouseEvent): void {
+    public editChangeRecommendation(reco: ViewMotionChangeRecommendation, $event: MouseEvent): void {
         $event.stopPropagation();
         $event.preventDefault();
 
diff --git a/client/src/app/site/motions/components/motion-detail-original-change-recommendations/motion-detail-original-change-recommendations.component.ts b/client/src/app/site/motions/components/motion-detail-original-change-recommendations/motion-detail-original-change-recommendations.component.ts
index c53947383..288483c42 100644
--- a/client/src/app/site/motions/components/motion-detail-original-change-recommendations/motion-detail-original-change-recommendations.component.ts
+++ b/client/src/app/site/motions/components/motion-detail-original-change-recommendations/motion-detail-original-change-recommendations.component.ts
@@ -11,7 +11,7 @@ import {
 } from '@angular/core';
 
 import { LineRange, ModificationType } from 'app/core/ui-services/diff.service';
-import { ViewChangeReco } from '../../models/view-change-reco';
+import { ViewMotionChangeRecommendation } from '../../models/view-change-recommendation';
 import { OperatorService } from 'app/core/core-services/operator.service';
 
 /**
@@ -48,13 +48,15 @@ export class MotionDetailOriginalChangeRecommendationsComponent implements OnIni
     public createChangeRecommendation: EventEmitter<LineRange> = new EventEmitter<LineRange>();
 
     @Output()
-    public gotoChangeRecommendation: EventEmitter<ViewChangeReco> = new EventEmitter<ViewChangeReco>();
+    public gotoChangeRecommendation: EventEmitter<ViewMotionChangeRecommendation> = new EventEmitter<
+        ViewMotionChangeRecommendation
+    >();
 
     @Input()
     public html: string;
 
     @Input()
-    public changeRecommendations: ViewChangeReco[];
+    public changeRecommendations: ViewMotionChangeRecommendation[];
 
     public showChangeRecommendations = false;
 
@@ -66,7 +68,7 @@ export class MotionDetailOriginalChangeRecommendationsComponent implements OnIni
      * @param {OperatorService} operator
      */
     public constructor(private renderer: Renderer2, private el: ElementRef, private operator: OperatorService) {
-        this.operator.getObservable().subscribe(this.onPermissionsChanged.bind(this));
+        this.operator.getUserObservable().subscribe(this.onPermissionsChanged.bind(this));
     }
 
     /**
@@ -109,7 +111,7 @@ export class MotionDetailOriginalChangeRecommendationsComponent implements OnIni
      */
     private getAffectedLineNumbers(): number[] {
         const affectedLines = [];
-        this.changeRecommendations.forEach((change: ViewChangeReco) => {
+        this.changeRecommendations.forEach((change: ViewMotionChangeRecommendation) => {
             for (let j = change.line_from; j < change.line_to; j++) {
                 affectedLines.push(j);
             }
@@ -188,7 +190,7 @@ export class MotionDetailOriginalChangeRecommendationsComponent implements OnIni
      * Style for the change recommendation list
      * @param reco
      */
-    public calcRecoTop(reco: ViewChangeReco): string {
+    public calcRecoTop(reco: ViewMotionChangeRecommendation): string {
         const from = <HTMLElement>(
             this.element.querySelector('.os-line-number.line-number-' + reco.line_from.toString(10))
         );
@@ -199,7 +201,7 @@ export class MotionDetailOriginalChangeRecommendationsComponent implements OnIni
      * Style for the change recommendation list
      * @param reco
      */
-    public calcRecoHeight(reco: ViewChangeReco): string {
+    public calcRecoHeight(reco: ViewMotionChangeRecommendation): string {
         const from = <HTMLElement>(
             this.element.querySelector('.os-line-number.line-number-' + reco.line_from.toString(10))
         );
@@ -216,7 +218,7 @@ export class MotionDetailOriginalChangeRecommendationsComponent implements OnIni
      * CSS-Class for the change recommendation list
      * @param reco
      */
-    public recoIsInsertion(reco: ViewChangeReco): boolean {
+    public recoIsInsertion(reco: ViewMotionChangeRecommendation): boolean {
         return reco.type === ModificationType.TYPE_INSERTION;
     }
 
@@ -224,7 +226,7 @@ export class MotionDetailOriginalChangeRecommendationsComponent implements OnIni
      * CSS-Class for the change recommendation list
      * @param reco
      */
-    public recoIsDeletion(reco: ViewChangeReco): boolean {
+    public recoIsDeletion(reco: ViewMotionChangeRecommendation): boolean {
         return reco.type === ModificationType.TYPE_DELETION;
     }
 
@@ -232,7 +234,7 @@ export class MotionDetailOriginalChangeRecommendationsComponent implements OnIni
      * CSS-Class for the change recommendation list
      * @param reco
      */
-    public recoIsReplacement(reco: ViewChangeReco): boolean {
+    public recoIsReplacement(reco: ViewMotionChangeRecommendation): boolean {
         return reco.type === ModificationType.TYPE_REPLACEMENT;
     }
 
@@ -240,7 +242,7 @@ export class MotionDetailOriginalChangeRecommendationsComponent implements OnIni
      * Trigger the `gotoChangeRecommendation`-event
      * @param reco
      */
-    public gotoReco(reco: ViewChangeReco): void {
+    public gotoReco(reco: ViewMotionChangeRecommendation): void {
         this.gotoChangeRecommendation.emit(reco);
     }
 
diff --git a/client/src/app/site/motions/components/motion-detail/motion-detail.component.html b/client/src/app/site/motions/components/motion-detail/motion-detail.component.html
index 32271e634..bd7e81b2e 100644
--- a/client/src/app/site/motions/components/motion-detail/motion-detail.component.html
+++ b/client/src/app/site/motions/components/motion-detail/motion-detail.component.html
@@ -385,7 +385,7 @@
         <div *ngIf="!editMotion && amendments && amendments.length > 0">
             <h4 translate>Amendments</h4>
             <div *ngFor="let amendment of amendments">
-                <a [routerLink]="amendment.motion.getDetailStateURL()">{{ amendment.identifierOrTitle }}</a>
+                <a [routerLink]="amendment.getDetailStateURL()">{{ amendment.identifierOrTitle }}</a>
             </div>
         </div>
 
diff --git a/client/src/app/site/motions/components/motion-detail/motion-detail.component.ts b/client/src/app/site/motions/components/motion-detail/motion-detail.component.ts
index 894e2efd6..f14febd05 100644
--- a/client/src/app/site/motions/components/motion-detail/motion-detail.component.ts
+++ b/client/src/app/site/motions/components/motion-detail/motion-detail.component.ts
@@ -7,7 +7,7 @@ import { MatDialog, MatExpansionPanel, MatSnackBar, MatCheckboxChange, ErrorStat
 import { BehaviorSubject, Subscription } from 'rxjs';
 import { TranslateService } from '@ngx-translate/core';
 
-import { AgendaRepositoryService } from 'app/core/repositories/agenda/agenda-repository.service';
+import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service';
 import { BaseViewComponent } from '../../../base/base-view';
 import { Category } from 'app/shared/models/motions/category';
 import { ChangeRecommendationRepositoryService } from 'app/core/repositories/motions/change-recommendation-repository.service';
@@ -32,7 +32,7 @@ import { PersonalNoteService } from 'app/core/ui-services/personal-note.service'
 import { PromptService } from 'app/core/ui-services/prompt.service';
 import { StatuteParagraphRepositoryService } from 'app/core/repositories/motions/statute-paragraph-repository.service';
 import { User } from 'app/shared/models/users/user';
-import { ViewChangeReco } from '../../models/view-change-reco';
+import { ViewMotionChangeRecommendation } from '../../models/view-change-recommendation';
 import { ViewCreateMotion } from '../../models/view-create-motion';
 import { ViewportService } from 'app/core/ui-services/viewport.service';
 import { ViewUnifiedChange } from '../../models/view-unified-change';
@@ -40,6 +40,14 @@ import { ViewStatuteParagraph } from '../../models/view-statute-paragraph';
 import { Workflow } from 'app/shared/models/motions/workflow';
 import { LinenumberingService } from 'app/core/ui-services/linenumbering.service';
 import { Tag } from 'app/shared/models/core/tag';
+import { ViewMotionBlock } from '../../models/view-motion-block';
+import { ViewWorkflow } from '../../models/view-workflow';
+import { ViewUser } from 'app/site/users/models/view-user';
+import { ViewCategory } from '../../models/view-category';
+import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile';
+import { ViewItem } from 'app/site/agenda/models/view-item';
+import { ViewTag } from 'app/site/tags/models/view-tag';
+import { ViewModelStoreService } from 'app/core/core-services/view-model-store.service';
 
 /**
  * Component for the motion detail view
@@ -154,7 +162,7 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit {
     /**
      * All change recommendations to this motion
      */
-    public changeRecommendations: ViewChangeReco[];
+    public changeRecommendations: ViewMotionChangeRecommendation[];
 
     /**
      * All amendments to this motions
@@ -189,42 +197,42 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit {
     /**
      * Subject for the Categories
      */
-    public categoryObserver: BehaviorSubject<Category[]>;
+    public categoryObserver: BehaviorSubject<ViewCategory[]>;
 
     /**
      * Subject for the Categories
      */
-    public workflowObserver: BehaviorSubject<Workflow[]>;
+    public workflowObserver: BehaviorSubject<ViewWorkflow[]>;
 
     /**
      * Subject for the Submitters
      */
-    public submitterObserver: BehaviorSubject<User[]>;
+    public submitterObserver: BehaviorSubject<ViewUser[]>;
 
     /**
      * Subject for the Supporters
      */
-    public supporterObserver: BehaviorSubject<User[]>;
+    public supporterObserver: BehaviorSubject<ViewUser[]>;
 
     /**
      * Subject for the motion blocks
      */
-    public blockObserver: BehaviorSubject<MotionBlock[]>;
+    public blockObserver: BehaviorSubject<ViewMotionBlock[]>;
 
     /**
      * Subject for mediafiles
      */
-    public mediafilesObserver: BehaviorSubject<Mediafile[]>;
+    public mediafilesObserver: BehaviorSubject<ViewMediafile[]>;
 
     /**
      * Subject for agenda items
      */
-    public agendaItemObserver: BehaviorSubject<Item[]>;
+    public agendaItemObserver: BehaviorSubject<ViewItem[]>;
 
     /**
      * Subject for tags
      */
-    public tagObserver: BehaviorSubject<Tag[]>;
+    public tagObserver: BehaviorSubject<ViewTag[]>;
 
     /**
      * Determine if the name of supporters are visible
@@ -357,7 +365,7 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit {
         private dialogService: MatDialog,
         private el: ElementRef,
         public repo: MotionRepositoryService,
-        private agendaRepo: AgendaRepositoryService,
+        private agendaRepo: ItemRepositoryService,
         private changeRecoRepo: ChangeRecommendationRepositoryService,
         private statuteRepo: StatuteParagraphRepositoryService,
         private DS: DataStoreService,
@@ -366,37 +374,38 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit {
         private promptService: PromptService,
         private pdfExport: MotionPdfExportService,
         private personalNoteService: PersonalNoteService,
-        private linenumberingService: LinenumberingService
+        private linenumberingService: LinenumberingService,
+        private viewModelStore: ViewModelStoreService
     ) {
         super(title, translate, matSnackBar);
 
         // Initial Filling of the Subjects
-        this.submitterObserver = new BehaviorSubject(DS.getAll(User));
-        this.supporterObserver = new BehaviorSubject(DS.getAll(User));
-        this.categoryObserver = new BehaviorSubject(DS.getAll(Category));
-        this.workflowObserver = new BehaviorSubject(DS.getAll(Workflow));
-        this.blockObserver = new BehaviorSubject(DS.getAll(MotionBlock));
-        this.mediafilesObserver = new BehaviorSubject(DS.getAll(Mediafile));
-        this.agendaItemObserver = new BehaviorSubject(DS.getAll(Item));
-        this.tagObserver = new BehaviorSubject(DS.getAll(Tag));
+        this.submitterObserver = new BehaviorSubject(this.viewModelStore.getAll(ViewUser));
+        this.supporterObserver = new BehaviorSubject(this.viewModelStore.getAll(ViewUser));
+        this.categoryObserver = new BehaviorSubject(this.viewModelStore.getAll(ViewCategory));
+        this.workflowObserver = new BehaviorSubject(this.viewModelStore.getAll(ViewWorkflow));
+        this.blockObserver = new BehaviorSubject(this.viewModelStore.getAll(ViewMotionBlock));
+        this.mediafilesObserver = new BehaviorSubject(this.viewModelStore.getAll(ViewMediafile));
+        this.agendaItemObserver = new BehaviorSubject(this.viewModelStore.getAll(ViewItem));
+        this.tagObserver = new BehaviorSubject(this.viewModelStore.getAll(ViewTag));
 
         // Make sure the subjects are updated, when a new Model for the type arrives
         this.DS.changeObservable.subscribe(newModel => {
             if (newModel instanceof User) {
-                this.submitterObserver.next(DS.getAll(User));
-                this.supporterObserver.next(DS.getAll(User));
+                this.submitterObserver.next(this.viewModelStore.getAll(ViewUser));
+                this.supporterObserver.next(this.viewModelStore.getAll(ViewUser));
             } else if (newModel instanceof Category) {
-                this.categoryObserver.next(DS.getAll(Category));
+                this.categoryObserver.next(this.viewModelStore.getAll(ViewCategory));
             } else if (newModel instanceof Workflow) {
-                this.workflowObserver.next(DS.getAll(Workflow));
+                this.workflowObserver.next(this.viewModelStore.getAll(ViewWorkflow));
             } else if (newModel instanceof MotionBlock) {
-                this.blockObserver.next(DS.getAll(MotionBlock));
+                this.blockObserver.next(this.viewModelStore.getAll(ViewMotionBlock));
             } else if (newModel instanceof Mediafile) {
-                this.mediafilesObserver.next(DS.getAll(Mediafile));
+                this.mediafilesObserver.next(this.viewModelStore.getAll(ViewMediafile));
             } else if (newModel instanceof Item) {
-                this.agendaItemObserver.next(DS.getAll(Item));
+                this.agendaItemObserver.next(this.viewModelStore.getAll(ViewItem));
             } else if (newModel instanceof Tag) {
-                this.tagObserver.next(DS.getAll(Tag));
+                this.tagObserver.next(this.viewModelStore.getAll(ViewTag));
             }
         });
 
@@ -505,8 +514,13 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit {
             // creates a new motion
             this.newMotion = true;
             this.editMotion = true;
-            this.motion = new ViewCreateMotion();
-            this.motionCopy = new ViewCreateMotion();
+            // prevent 'undefined' to appear in the ui
+            const defaultMotion = {
+                title: '',
+                origin: ''
+            };
+            this.motion = new ViewCreateMotion(new CreateMotion(defaultMotion));
+            this.motionCopy = new ViewCreateMotion(new CreateMotion(defaultMotion));
         } else {
             // load existing motion
             this.route.params.subscribe(params => {
@@ -528,10 +542,12 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit {
                         this.recalcUnifiedChanges();
                     }
                 );
-                this.changeRecoRepo.getChangeRecosOfMotionObservable(motionId).subscribe((recos: ViewChangeReco[]) => {
-                    this.changeRecommendations = recos;
-                    this.recalcUnifiedChanges();
-                });
+                this.changeRecoRepo
+                    .getChangeRecosOfMotionObservable(motionId)
+                    .subscribe((recos: ViewMotionChangeRecommendation[]) => {
+                        this.changeRecommendations = recos;
+                        this.recalcUnifiedChanges();
+                    });
             });
         }
     }
@@ -851,7 +867,7 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit {
      * In the original version, a change-recommendation-annotation has been clicked
      * -> Go to the diff view and scroll to the change recommendation
      */
-    public gotoChangeRecommendation(changeRecommendation: ViewChangeReco): void {
+    public gotoChangeRecommendation(changeRecommendation: ViewMotionChangeRecommendation): void {
         this.scrollToChange = changeRecommendation;
         this.setChangeRecoMode(ChangeRecoMode.Diff);
     }
@@ -1139,7 +1155,7 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit {
      * @param attachment the selected file
      */
     public onClickAttacment(attachment: Mediafile): void {
-        window.open(attachment.getDownloadUrl());
+        window.open(attachment.downloadUrl);
     }
 
     /**
@@ -1196,6 +1212,10 @@ export class MotionDetailComponent extends BaseViewComponent implements OnInit {
      * @returns a string representing a color
      */
     public getStateCssColor(): string {
+        if (!this.motion.state) {
+            return '';
+        }
+
         switch (this.motion.state.css_class) {
             case 'success':
                 return 'green';
diff --git a/client/src/app/site/motions/components/motion-poll/motion-poll.component.ts b/client/src/app/site/motions/components/motion-poll/motion-poll.component.ts
index 7eeacc002..60a966231 100644
--- a/client/src/app/site/motions/components/motion-poll/motion-poll.component.ts
+++ b/client/src/app/site/motions/components/motion-poll/motion-poll.component.ts
@@ -105,9 +105,11 @@ export class MotionPollComponent implements OnInit {
     public ngOnInit(): void {
         this.poll = new MotionPoll(this.rawPoll);
         this.motionRepo.getViewModelObservable(this.poll.motion_id).subscribe(viewmotion => {
-            const updatePoll = viewmotion.motion.polls.find(poll => poll.id === this.poll.id);
-            if (updatePoll) {
-                this.poll = new MotionPoll(updatePoll);
+            if (viewmotion) {
+                const updatePoll = viewmotion.motion.polls.find(poll => poll.id === this.poll.id);
+                if (updatePoll) {
+                    this.poll = new MotionPoll(updatePoll);
+                }
             }
         });
     }
diff --git a/client/src/app/site/motions/models/view-category.ts b/client/src/app/site/motions/models/view-category.ts
index e74ce221b..54aa382f7 100644
--- a/client/src/app/site/motions/models/view-category.ts
+++ b/client/src/app/site/motions/models/view-category.ts
@@ -1,5 +1,7 @@
 import { Category } from 'app/shared/models/motions/category';
 import { BaseViewModel } from '../../base/base-view-model';
+import { SearchRepresentation } from 'app/core/ui-services/search.service';
+import { Searchable } from 'app/site/base/searchable';
 
 /**
  * Category class for the View
@@ -8,7 +10,7 @@ import { BaseViewModel } from '../../base/base-view-model';
  * Provides "safe" access to variables and functions in {@link Category}
  * @ignore
  */
-export class ViewCategory extends BaseViewModel {
+export class ViewCategory extends BaseViewModel implements Searchable {
     private _category: Category;
 
     public get category(): Category {
@@ -16,51 +18,66 @@ export class ViewCategory extends BaseViewModel {
     }
 
     public get id(): number {
-        return this.category ? this.category.id : null;
+        return this.category.id;
     }
 
     public get name(): string {
-        return this.category ? this.category.name : null;
+        return this.category.name;
     }
 
     public get prefix(): string {
-        return this.category && this.category.prefix ? this.category.prefix : null;
+        return this.category.prefix;
     }
 
-    public set prefix(pref: string) {
-        this._category.prefix = pref;
+    public set prefix(prefix: string) {
+        this._category.prefix = prefix;
     }
 
-    public set name(nam: string) {
-        this._category.name = nam;
-    }
-
-    public constructor(category?: Category, id?: number, prefix?: string, name?: string) {
-        super();
-        if (!category) {
-            category = new Category();
-            category.id = id;
-            category.name = name;
-            category.prefix = prefix;
-        }
-        this._category = category;
-    }
-
-    public getTitle(): string {
-        return this.name;
+    public set name(name: string) {
+        this._category.name = name;
     }
 
     public get prefixedName(): string {
-        return this.category.getTitle();
+        return this.prefix ? this.prefix + ' - ' + this.name : this.name;
+    }
+
+    public constructor(category: Category) {
+        super('Category');
+        this._category = category;
+    }
+
+    /**
+     * Returns the verbose name of this model.
+     *
+     * @override
+     * @param plural If the name should be plural
+     * @param The verbose name
+     */
+    public getVerboseName(plural: boolean = false): string {
+        if (plural) {
+            return 'Categories';
+        } else {
+            return this._verboseName;
+        }
+    }
+
+    public getTitle(): string {
+        return this.prefixedName;
+    }
+
+    public formatForSearch(): SearchRepresentation {
+        return [this.name, this.prefix];
+    }
+
+    public getDetailStateURL(): string {
+        return '/motions/category';
     }
 
     /**
      * Updates the local objects if required
      * @param update
      */
-    public updateValues(update: Category): void {
-        this._category = update;
-    }
+    public updateDependencies(update: BaseViewModel): void {}
 
     /**
      * Duplicate this motion into a copy of itself
diff --git a/client/src/app/site/motions/models/view-change-reco.ts b/client/src/app/site/motions/models/view-change-recommendation.ts
similarity index 53%
rename from client/src/app/site/motions/models/view-change-reco.ts
rename to client/src/app/site/motions/models/view-change-recommendation.ts
index 3bf5da364..0fd02b74a 100644
--- a/client/src/app/site/motions/models/view-change-reco.ts
+++ b/client/src/app/site/motions/models/view-change-recommendation.ts
@@ -1,7 +1,6 @@
 import { BaseViewModel } from '../../base/base-view-model';
-import { MotionChangeReco } from 'app/shared/models/motions/motion-change-reco';
-import { BaseModel } from 'app/shared/models/base/base-model';
 import { ModificationType } from 'app/core/ui-services/diff.service';
+import { MotionChangeRecommendation } from 'app/shared/models/motions/motion-change-reco';
 import { ViewUnifiedChange, ViewUnifiedChangeType } from './view-unified-change';
 
 /**
@@ -11,68 +10,65 @@ import { ViewUnifiedChange, ViewUnifiedChangeType } from './view-unified-change'
  * Provides "safe" access to variables and functions in {@link MotionChangeReco}
  * @ignore
  */
-export class ViewChangeReco extends BaseViewModel implements ViewUnifiedChange {
-    private _changeReco: MotionChangeReco;
+export class ViewMotionChangeRecommendation extends BaseViewModel implements ViewUnifiedChange {
+    private _changeRecommendation: MotionChangeRecommendation;
 
     public get id(): number {
-        return this._changeReco ? this._changeReco.id : null;
+        return this._changeRecommendation.id;
     }
 
-    public get changeRecommendation(): MotionChangeReco {
-        return this._changeReco;
+    public get changeRecommendation(): MotionChangeRecommendation {
+        return this._changeRecommendation;
     }
 
-    public constructor(changeReco?: MotionChangeReco) {
-        super();
-
-        this._changeReco = changeReco;
+    public constructor(changeReco: MotionChangeRecommendation) {
+        super('Change recommendation');
+        this._changeRecommendation = changeReco;
     }
 
     public getTitle(): string {
-        return this._changeReco.getTitle();
+        return 'Changerecommendation';
     }
 
-    public updateValues(update: BaseModel): void {
-        // @TODO Is there any need for this function?
-    }
+    public updateDependencies(update: BaseViewModel): void {}
 
     public updateChangeReco(type: number, text: string, internal: boolean): void {
         // @TODO HTML sanitazion
-        this._changeReco.type = type;
-        this._changeReco.text = text;
-        this._changeReco.internal = internal;
+        this._changeRecommendation.type = type;
+        this._changeRecommendation.text = text;
+        this._changeRecommendation.internal = internal;
     }
 
     public get rejected(): boolean {
-        return this._changeReco ? this._changeReco.rejected : null;
+        return this._changeRecommendation.rejected;
     }
 
     public get internal(): boolean {
-        return this._changeReco ? this._changeReco.internal : null;
+        return this._changeRecommendation.internal;
     }
 
     public get type(): number {
-        return this._changeReco ? this._changeReco.type : ModificationType.TYPE_REPLACEMENT;
+        return this._changeRecommendation.type || ModificationType.TYPE_REPLACEMENT;
     }
 
     public get other_description(): string {
-        return this._changeReco ? this._changeReco.other_description : null;
+        return this._changeRecommendation.other_description;
     }
 
     public get line_from(): number {
-        return this._changeReco ? this._changeReco.line_from : null;
+        return this._changeRecommendation.line_from;
     }
 
     public get line_to(): number {
-        return this._changeReco ? this._changeReco.line_to : null;
+        return this._changeRecommendation.line_to;
     }
 
     public get text(): string {
-        return this._changeReco ? this._changeReco.text : null;
+        return this._changeRecommendation.text;
     }
 
     public get motion_id(): number {
-        return this._changeReco ? this._changeReco.motion_id : null;
+        return this._changeRecommendation.motion_id;
     }
 
     public getChangeId(): string {
diff --git a/client/src/app/site/motions/models/view-create-motion.ts b/client/src/app/site/motions/models/view-create-motion.ts
index b14cb899b..c31e8d356 100644
--- a/client/src/app/site/motions/models/view-create-motion.ts
+++ b/client/src/app/site/motions/models/view-create-motion.ts
@@ -1,11 +1,11 @@
-import { Category } from 'app/shared/models/motions/category';
-import { User } from 'app/shared/models/users/user';
-import { Workflow } from 'app/shared/models/motions/workflow';
 import { WorkflowState } from 'app/shared/models/motions/workflow-state';
-import { Item } from 'app/shared/models/agenda/item';
-import { MotionBlock } from 'app/shared/models/motions/motion-block';
 import { ViewMotion } from './view-motion';
 import { CreateMotion } from './create-motion';
+import { ViewUser } from 'app/site/users/models/view-user';
+import { ViewMotionBlock } from './view-motion-block';
+import { ViewItem } from 'app/site/agenda/models/view-item';
+import { ViewCategory } from './view-category';
+import { ViewWorkflow } from './view-workflow';
 
 /**
  * Create motion class for the View. Its different to ViewMotion in fact that the submitter handling is different
@@ -20,7 +20,7 @@ export class ViewCreateMotion extends ViewMotion {
         return this._motion;
     }
 
-    public get submitters(): User[] {
+    public get submitters(): ViewUser[] {
         return this._submitters;
     }
 
@@ -28,20 +28,20 @@ export class ViewCreateMotion extends ViewMotion {
         return this.motion ? this.motion.submitters_id : null;
     }
 
-    public set submitters(users: User[]) {
+    public set submitters(users: ViewUser[]) {
         this._submitters = users;
         this._motion.submitters_id = users.map(user => user.id);
     }
 
     public constructor(
         motion?: CreateMotion,
-        category?: Category,
-        submitters?: User[],
-        supporters?: User[],
-        workflow?: Workflow,
+        category?: ViewCategory,
+        submitters?: ViewUser[],
+        supporters?: ViewUser[],
+        workflow?: ViewWorkflow,
         state?: WorkflowState,
-        item?: Item,
-        block?: MotionBlock
+        item?: ViewItem,
+        block?: ViewMotionBlock
     ) {
         super(motion, category, submitters, supporters, workflow, state, item, block, null);
     }
diff --git a/client/src/app/site/motions/models/view-motion-block.ts b/client/src/app/site/motions/models/view-motion-block.ts
index a47546cde..35e6b840a 100644
--- a/client/src/app/site/motions/models/view-motion-block.ts
+++ b/client/src/app/site/motions/models/view-motion-block.ts
@@ -1,39 +1,78 @@
-import { BaseViewModel } from 'app/site/base/base-view-model';
 import { MotionBlock } from 'app/shared/models/motions/motion-block';
+import { BaseAgendaViewModel } from 'app/site/base/base-agenda-view-model';
+import { SearchRepresentation } from 'app/core/ui-services/search.service';
+import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable';
+import { Searchable } from 'app/site/base/searchable';
+import { ViewItem } from 'app/site/agenda/models/view-item';
+import { BaseViewModel } from 'app/site/base/base-view-model';
 
 /**
  * ViewModel for motion blocks.
  * @ignore
  */
-export class ViewMotionBlock extends BaseViewModel {
+export class ViewMotionBlock extends BaseAgendaViewModel implements Searchable {
     private _motionBlock: MotionBlock;
+    private _agendaItem: ViewItem;
 
     public get motionBlock(): MotionBlock {
         return this._motionBlock;
     }
 
+    public get agendaItem(): ViewItem {
+        return this._agendaItem;
+    }
+
     public get id(): number {
-        return this.motionBlock ? this.motionBlock.id : null;
+        return this.motionBlock.id;
     }
 
     public get title(): string {
-        return this.motionBlock ? this.motionBlock.title : null;
+        return this.motionBlock.title;
     }
 
     public get agenda_item_id(): number {
-        return this.motionBlock ? this.motionBlock.agenda_item_id : null;
+        return this.motionBlock.agenda_item_id;
     }
 
-    public constructor(motionBlock: MotionBlock) {
-        super();
+    public constructor(motionBlock: MotionBlock, agendaItem?: ViewItem) {
+        super('Motion block');
         this._motionBlock = motionBlock;
+        this._agendaItem = agendaItem;
     }
 
-    public updateValues(update: MotionBlock): void {
-        this._motionBlock = update;
+    /**
+     * Formats the category for search
+     *
+     * @override
+     */
+    public formatForSearch(): SearchRepresentation {
+        return [this.title];
+    }
+
+    public getAgendaItem(): ViewItem {
+        return this.agendaItem;
+    }
+
+    /**
+     * Get the URL to the motion block
+     *
+     * @returns the URL as string
+     */
+    public getDetailStateURL(): string {
+        return `/motions/blocks/${this.id}`;
+    }
+
+    public updateDependencies(update: BaseViewModel): void {
+        if (update instanceof ViewItem && this.agenda_item_id === update.id) {
+            this._agendaItem = update;
+        }
     }
 
     public getTitle(): string {
         return this.title;
     }
+
+    public getSlide(): ProjectorElementBuildDeskriptor {
+        throw new Error('todo');
+    }
 }
diff --git a/client/src/app/site/motions/models/view-motion-comment-section.ts b/client/src/app/site/motions/models/view-motion-comment-section.ts
index 024ccf5da..9820651a7 100644
--- a/client/src/app/site/motions/models/view-motion-comment-section.ts
+++ b/client/src/app/site/motions/models/view-motion-comment-section.ts
@@ -1,7 +1,6 @@
 import { BaseViewModel } from '../../base/base-view-model';
 import { MotionCommentSection } from 'app/shared/models/motions/motion-comment-section';
-import { Group } from 'app/shared/models/users/group';
-import { BaseModel } from 'app/shared/models/base/base-model';
+import { ViewGroup } from 'app/site/users/models/view-group';
 
 /**
  * Motion comment section class for the View
@@ -13,46 +12,46 @@ import { BaseModel } from 'app/shared/models/base/base-model';
 export class ViewMotionCommentSection extends BaseViewModel {
     private _section: MotionCommentSection;
 
-    private _read_groups: Group[];
-    private _write_groups: Group[];
+    private _readGroups: ViewGroup[];
+    private _writeGroups: ViewGroup[];
 
     public get section(): MotionCommentSection {
         return this._section;
     }
 
     public get id(): number {
-        return this.section ? this.section.id : null;
+        return this.section.id;
     }
 
     public get name(): string {
-        return this.section ? this.section.name : null;
+        return this.section.name;
     }
 
     public get read_groups_id(): number[] {
-        return this.section ? this.section.read_groups_id : [];
+        return this.section.read_groups_id;
     }
 
     public get write_groups_id(): number[] {
-        return this.section ? this.section.write_groups_id : [];
+        return this.section.write_groups_id;
     }
 
-    public get read_groups(): Group[] {
-        return this._read_groups;
+    public get read_groups(): ViewGroup[] {
+        return this._readGroups;
     }
 
-    public get write_groups(): Group[] {
-        return this._write_groups;
+    public get write_groups(): ViewGroup[] {
+        return this._writeGroups;
     }
 
     public set name(name: string) {
         this._section.name = name;
     }
 
-    public constructor(section: MotionCommentSection, read_groups: Group[], write_groups: Group[]) {
-        super();
+    public constructor(section: MotionCommentSection, readGroups: ViewGroup[], writeGroups: ViewGroup[]) {
+        super('Comment section');
         this._section = section;
-        this._read_groups = read_groups;
-        this._write_groups = write_groups;
+        this._readGroups = readGroups;
+        this._writeGroups = writeGroups;
     }
 
     public getTitle(): string {
@@ -63,22 +62,21 @@ export class ViewMotionCommentSection extends BaseViewModel {
      * Updates the local objects if required
      * @param section
      */
-    public updateValues(update: BaseModel): void {
-        if (update instanceof MotionCommentSection) {
-            this._section = update as MotionCommentSection;
-        }
-        if (update instanceof Group) {
-            this.updateGroup(update as Group);
+    public updateDependencies(update: BaseViewModel): void {
+        if (update instanceof ViewGroup) {
+            this.updateGroup(update);
         }
     }
 
     // TODO: Implement updating of groups
-    public updateGroup(group: Group): void {}
+    public updateGroup(group: ViewGroup): void {
+        console.log('implement update group of motion comment section');
+    }
 
     /**
      * Duplicate this motion into a copy of itself
      */
     public copy(): ViewMotionCommentSection {
-        return new ViewMotionCommentSection(this._section, this._read_groups, this._write_groups);
+        return new ViewMotionCommentSection(this._section, this._readGroups, this._writeGroups);
     }
 }
diff --git a/client/src/app/site/motions/models/view-motion.ts b/client/src/app/site/motions/models/view-motion.ts
index bf424dc52..aed157374 100644
--- a/client/src/app/site/motions/models/view-motion.ts
+++ b/client/src/app/site/motions/models/view-motion.ts
@@ -1,18 +1,20 @@
-import { BaseModel } from 'app/shared/models/base/base-model';
-import { BaseProjectableModel } from 'app/site/base/base-projectable-model';
-import { Category } from 'app/shared/models/motions/category';
 import { MotionComment } from 'app/shared/models/motions/motion-comment';
-import { Item } from 'app/shared/models/agenda/item';
-import { Mediafile } from 'app/shared/models/mediafiles/mediafile';
 import { Motion } from 'app/shared/models/motions/motion';
-import { MotionBlock } from 'app/shared/models/motions/motion-block';
 import { PersonalNoteContent } from 'app/shared/models/users/personal-note';
-import { User } from 'app/shared/models/users/user';
 import { ViewMotionCommentSection } from './view-motion-comment-section';
-import { Workflow } from 'app/shared/models/motions/workflow';
 import { WorkflowState } from 'app/shared/models/motions/workflow-state';
 import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable';
-import { Tag } from 'app/shared/models/core/tag';
+import { SearchRepresentation } from 'app/core/ui-services/search.service';
+import { BaseAgendaViewModel } from 'app/site/base/base-agenda-view-model';
+import { Searchable } from 'app/site/base/searchable';
+import { ViewUser } from 'app/site/users/models/view-user';
+import { ViewTag } from 'app/site/tags/models/view-tag';
+import { ViewMediafile } from 'app/site/mediafiles/models/view-mediafile';
+import { ViewItem } from 'app/site/agenda/models/view-item';
+import { ViewWorkflow } from './view-workflow';
+import { ViewCategory } from './view-category';
+import { ViewMotionBlock } from './view-motion-block';
+import { BaseViewModel } from 'app/site/base/base-view-model';
 
 /**
  * The line numbering mode for the motion detail view.
@@ -42,18 +44,18 @@ export enum ChangeRecoMode {
  * Provides "safe" access to variables and functions in {@link Motion}
  * @ignore
  */
-export class ViewMotion extends BaseProjectableModel {
+export class ViewMotion extends BaseAgendaViewModel implements Searchable {
     protected _motion: Motion;
-    protected _category: Category;
-    protected _submitters: User[];
-    protected _supporters: User[];
-    protected _workflow: Workflow;
+    protected _category: ViewCategory;
+    protected _submitters: ViewUser[];
+    protected _supporters: ViewUser[];
+    protected _workflow: ViewWorkflow;
     protected _state: WorkflowState;
-    protected _item: Item;
-    protected _block: MotionBlock;
-    protected _attachments: Mediafile[];
-    protected _tags: Tag[];
-    protected _parent: Motion;
+    protected _item: ViewItem;
+    protected _block: ViewMotionBlock;
+    protected _attachments: ViewMediafile[];
+    protected _tags: ViewTag[];
+    protected _parent: ViewMotion;
     public personalNote: PersonalNoteContent;
 
     /**
@@ -67,34 +69,31 @@ export class ViewMotion extends BaseProjectableModel {
     }
 
     public get id(): number {
-        return this.motion ? this.motion.id : null;
+        return this.motion.id;
     }
 
     public get identifier(): string {
-        return this.motion && this.motion.identifier ? this.motion.identifier : null;
+        return this.motion.identifier;
     }
 
     public get title(): string {
-        return this.motion ? this.motion.title : null;
+        return this.motion.title;
     }
 
     public get identifierOrTitle(): string {
-        if (!this.motion) {
-            return null;
-        }
         return this.identifier ? this.identifier : this.title;
     }
 
     public get text(): string {
-        return this.motion ? this.motion.text : null;
+        return this.motion.text;
     }
 
     public get reason(): string {
-        return this.motion ? this.motion.reason : null;
+        return this.motion.reason;
     }
 
     public get modified_final_version(): string {
-        return this.motion ? this.motion.modified_final_version : null;
+        return this.motion.modified_final_version;
     }
 
     public set modified_final_version(value: string) {
@@ -104,47 +103,52 @@ export class ViewMotion extends BaseProjectableModel {
     }
 
     public get weight(): number {
-        return this.motion ? this.motion.weight : null;
+        return this.motion.weight;
     }
 
     public get sort_parent_id(): number {
-        return this.motion ? this.motion.sort_parent_id : null;
-    }
-
-    public get category(): Category {
-        return this._category;
+        return this.motion.sort_parent_id;
     }
 
     public get agenda_item_id(): number {
-        return this.motion ? this.motion.agenda_item_id : null;
+        return this.motion.agenda_item_id;
     }
 
     public get category_id(): number {
-        return this.motion && this.category ? this.motion.category_id : null;
+        return this.motion.category_id;
     }
 
-    public get submitters(): User[] {
+    public get category(): ViewCategory {
+        return this._category;
+    }
+
+    public get submitters(): ViewUser[] {
         return this._submitters;
     }
 
     public get submitters_id(): number[] {
-        return this.motion ? this.motion.submitterIds : null;
+        return this.motion.submitterIds;
     }
 
-    public get supporters(): User[] {
+    public get supporters(): ViewUser[] {
         return this._supporters;
     }
 
     public get supporters_id(): number[] {
-        return this.motion ? this.motion.supporters_id : null;
+        return this.motion.supporters_id;
     }
 
-    public get workflow(): Workflow {
+    public set supporters(users: ViewUser[]) {
+        this._supporters = users;
+        this._motion.supporters_id = users.map(user => user.id);
+    }
+
+    public get workflow(): ViewWorkflow {
         return this._workflow;
     }
 
     public get workflow_id(): number {
-        return this.motion ? this.motion.workflow_id : null;
+        return this.motion.workflow_id;
     }
 
     public get state(): WorkflowState {
@@ -161,19 +165,19 @@ export class ViewMotion extends BaseProjectableModel {
     }
 
     public get state_id(): number {
-        return this.motion && this.motion.state_id ? this.motion.state_id : null;
+        return this.motion.state_id;
     }
 
     public get recommendation_id(): number {
-        return this.motion && this.motion.recommendation_id ? this.motion.recommendation_id : null;
+        return this.motion.recommendation_id;
     }
 
     public get statute_paragraph_id(): number {
-        return this.motion && this.motion.statute_paragraph_id ? this.motion.statute_paragraph_id : null;
+        return this.motion.statute_paragraph_id;
     }
 
     public get recommendation(): WorkflowState {
-        return this.recommendation_id && this.workflow ? this.workflow.getStateById(this.recommendation_id) : null;
+        return this.workflow ? this.workflow.getStateById(this.recommendation_id) : null;
     }
 
     public get possibleRecommendations(): WorkflowState[] {
@@ -183,19 +187,14 @@ export class ViewMotion extends BaseProjectableModel {
     }
 
     public get origin(): string {
-        return this.motion ? this.motion.origin : null;
+        return this.motion.origin;
     }
 
     public get nextStates(): WorkflowState[] {
-        return this.state && this.workflow ? this.state.getNextStates(this.workflow) : null;
+        return this.state && this.workflow ? this.state.getNextStates(this.workflow.workflow) : [];
     }
 
-    public set supporters(users: User[]) {
-        this._supporters = users;
-        this._motion.supporters_id = users.map(user => user.id);
-    }
-
-    public get item(): Item {
+    public get item(): ViewItem {
         return this._item;
     }
 
@@ -204,10 +203,10 @@ export class ViewMotion extends BaseProjectableModel {
     }
 
     public get motion_block_id(): number {
-        return this.motion ? this.motion.motion_block_id : null;
+        return this.motion.motion_block_id;
     }
 
-    public get motion_block(): MotionBlock {
+    public get motion_block(): ViewMotionBlock {
         return this._block;
     }
 
@@ -216,30 +215,30 @@ export class ViewMotion extends BaseProjectableModel {
     }
 
     public get parent_id(): number {
-        return this.motion && this.motion.parent_id ? this.motion.parent_id : null;
+        return this.motion.parent_id;
     }
 
     public get amendment_paragraphs(): string[] {
-        return this.motion && this.motion.amendment_paragraphs ? this.motion.amendment_paragraphs : [];
+        return this.motion.amendment_paragraphs ? this.motion.amendment_paragraphs : [];
     }
 
     public get tags_id(): number[] {
-        return this.motion ? this.motion.tags_id : null;
+        return this.motion.tags_id;
     }
 
     public get attachments_id(): number[] {
-        return this.motion ? this.motion.attachments_id : null;
+        return this.motion.attachments_id;
     }
 
-    public get attachments(): Mediafile[] {
-        return this._attachments ? this._attachments : null;
+    public get attachments(): ViewMediafile[] {
+        return this._attachments;
     }
 
-    public get tags(): Tag[] {
-        return this._tags ? this._tags : null;
+    public get tags(): ViewTag[] {
+        return this._tags;
     }
 
-    public get parent(): Motion {
+    public get parent(): ViewMotion {
         return this._parent;
     }
 
@@ -247,7 +246,7 @@ export class ViewMotion extends BaseProjectableModel {
      * @returns the creation date as Date object
      */
     public get creationDate(): Date {
-        if (!this.motion || !this.motion.created) {
+        if (!this.motion.created) {
             return null;
         }
         return new Date(this.motion.created);
@@ -257,7 +256,7 @@ export class ViewMotion extends BaseProjectableModel {
      * @returns the date of the last change as Date object, null if empty
      */
     public get lastChangeDate(): Date {
-        if (!this.motion || !this.motion.last_modified) {
+        if (!this.motion.last_modified) {
             return null;
         }
         return new Date(this.motion.last_modified);
@@ -316,19 +315,19 @@ export class ViewMotion extends BaseProjectableModel {
     }
 
     public constructor(
-        motion?: Motion,
-        category?: Category,
-        submitters?: User[],
-        supporters?: User[],
-        workflow?: Workflow,
+        motion: Motion,
+        category?: ViewCategory,
+        submitters?: ViewUser[],
+        supporters?: ViewUser[],
+        workflow?: ViewWorkflow,
         state?: WorkflowState,
-        item?: Item,
-        block?: MotionBlock,
-        attachments?: Mediafile[],
-        tags?: Tag[],
-        parent?: Motion
+        item?: ViewItem,
+        block?: ViewMotionBlock,
+        attachments?: ViewMediafile[],
+        tags?: ViewTag[],
+        parent?: ViewMotion
     ) {
-        super();
+        super('Motion');
         this._motion = motion;
         this._category = category;
         this._submitters = submitters;
@@ -344,9 +343,51 @@ export class ViewMotion extends BaseProjectableModel {
 
     public getTitle(): string {
         if (this.identifier) {
-            return 'Motion ' + this.identifier;
+            return this.identifier + ': ' + this.title;
+        } else {
+            return this.title;
         }
-        return this.title;
+    }
+
+    public getAgendaItem(): ViewItem {
+        return this.item;
+    }
+
+    public getAgendaTitle(): string {
+        // if the identifier is set, the title will be 'Motion <identifier>'.
+        if (this.identifier) {
+            return 'Motion ' + this.identifier;
+        } else {
+            return this.getTitle();
+        }
+    }
+
+    public getAgendaTitleWithType(): string {
+        // Append the verbose name only, if not the special format 'Motion <identifier>' is used.
+        if (this.identifier) {
+            return 'Motion ' + this.identifier;
+        } else {
+            return this.getTitle() + ' (' + this.getVerboseName() + ')';
+        }
+    }
+
+    /**
+     * Formats the category for search
+     *
+     * TODO!!!!
+     *
+     * @override
+     */
+    public formatForSearch(): SearchRepresentation {
+        let searchValues = [this.title, this.text, this.reason];
+        if (this.amendment_paragraphs) {
+            searchValues = searchValues.concat(this.amendment_paragraphs.filter(x => !!x));
+        }
+        return searchValues;
+    }
+
+    public getDetailStateURL(): string {
+        return `/motions/${this.id}`;
     }
 
     /**
@@ -366,34 +407,23 @@ export class ViewMotion extends BaseProjectableModel {
      *
      * @param update
      */
-    public updateValues(update: BaseModel): void {
-        if (update instanceof Workflow) {
-            this.updateWorkflow(update as Workflow);
-        } else if (update instanceof Category) {
-            this.updateCategory(update as Category);
-        } else if (update instanceof Item) {
-            this.updateItem(update as Item);
-        } else if (update instanceof MotionBlock) {
+    public updateDependencies(update: BaseViewModel): void {
+        if (update instanceof ViewWorkflow) {
+            this.updateWorkflow(update);
+        } else if (update instanceof ViewCategory) {
+            this.updateCategory(update);
+        } else if (update instanceof ViewItem) {
+            this.updateItem(update);
+        } else if (update instanceof ViewMotionBlock) {
             this.updateMotionBlock(update);
-        } else if (update instanceof User) {
-            this.updateUser(update as User);
-        } else if (update instanceof Mediafile) {
-            this.updateAttachments(update as Mediafile);
-        } else if (update instanceof Tag) {
-            this.updateTags(update as Tag);
-        } else if (update instanceof Motion && update.id !== this.id) {
-            this.updateParent(update as Motion);
-        }
-    }
-
-    /**
-     * Update routine for the category
-     *
-     * @param category potentially the changed category. Needs manual verification
-     */
-    public updateCategory(category: Category): void {
-        if (this.motion && category.id === this.motion.category_id) {
-            this._category = category;
+        } else if (update instanceof ViewUser) {
+            this.updateUser(update);
+        } else if (update instanceof ViewMediafile) {
+            this.updateAttachments(update);
+        } else if (update instanceof ViewTag) {
+            this.updateTags(update);
+        } else if (update instanceof ViewMotion && update.id !== this.id) {
+            this.updateParent(update);
         }
     }
 
@@ -402,20 +432,31 @@ export class ViewMotion extends BaseProjectableModel {
      *
      * @param workflow potentially the (changed workflow (state). Needs manual verification
      */
-    public updateWorkflow(workflow: Workflow): void {
-        if (this.motion && workflow.id === this.motion.workflow_id) {
+    public updateWorkflow(workflow: ViewWorkflow): void {
+        if (workflow.id === this.motion.workflow_id) {
             this._workflow = workflow;
             this._state = workflow.getStateById(this.state_id);
         }
     }
 
+    /**
+     * Update routine for the category
+     *
+     * @param category potentially the changed category. Needs manual verification
+     */
+    public updateCategory(category: ViewCategory): void {
+        if (this.category_id && category.id === this.motion.category_id) {
+            this._category = category;
+        }
+    }
+
     /**
      * Update routine for the agenda Item
      *
      * @param item potentially the changed agenda Item. Needs manual verification
      */
-    public updateItem(item: Item): void {
-        if (this.motion && item.id === this.motion.agenda_item_id) {
+    public updateItem(item: ViewItem): void {
+        if (item.id === this.motion.agenda_item_id) {
             this._item = item;
         }
     }
@@ -425,8 +466,8 @@ export class ViewMotion extends BaseProjectableModel {
      *
      * @param block potentially the changed motion block. Needs manual verification
      */
-    public updateMotionBlock(block: MotionBlock): void {
-        if (this.motion && block.id === this.motion.motion_block_id) {
+    public updateMotionBlock(block: ViewMotionBlock): void {
+        if (this.motion_block_id && block.id === this.motion.motion_block_id) {
             this._block = block;
         }
     }
@@ -436,47 +477,39 @@ export class ViewMotion extends BaseProjectableModel {
      *
      * @param update potentially the changed agenda Item. Needs manual verification
      */
-    public updateUser(update: User): void {
-        if (this.motion) {
-            if (this.motion.submitters && this.motion.submitters.findIndex(user => user.user_id === update.id)) {
-                const userIndex = this.submitters.findIndex(user => user.id === update.id);
-                this.submitters[userIndex] = update as User;
-            }
-            if (this.motion.supporters_id && this.motion.supporters_id.includes(update.id)) {
-                const userIndex = this.supporters.findIndex(user => user.id === update.id);
-                this.supporters[userIndex] = update as User;
-            }
+    public updateUser(update: ViewUser): void {
+        if (this.motion.submitters && this.motion.submitters.findIndex(user => user.user_id === update.id)) {
+            const userIndex = this.submitters.findIndex(user => user.id === update.id);
+            this.submitters[userIndex] = update;
+        }
+        if (this.motion.supporters_id && this.motion.supporters_id.includes(update.id)) {
+            const userIndex = this.supporters.findIndex(user => user.id === update.id);
+            this.supporters[userIndex] = update;
         }
     }
 
     /**
      * Update routine for attachments
      *
-     * @param update
+     * @param mediafile
      */
-    public updateAttachments(update: Mediafile): void {
-        if (this.motion) {
-            if (this.attachments_id && this.attachments_id.includes(update.id)) {
-                const attachmentIndex = this.attachments.findIndex(mediafile => mediafile.id === update.id);
-                this.attachments[attachmentIndex] = update as Mediafile;
-            }
+    public updateAttachments(mediafile: ViewMediafile): void {
+        if (this.attachments_id && this.attachments_id.includes(mediafile.id)) {
+            const attachmentIndex = this.attachments.findIndex(_mediafile => _mediafile.id === mediafile.id);
+            this.attachments[attachmentIndex] = mediafile;
         }
     }
 
-    public updateTags(update: Tag): void {
-        if (this.motion) {
-            if (this.tags_id && this.tags_id.includes(update.id)) {
-                const tagIndex = this.tags.findIndex(tag => tag.id === update.id);
-                this.tags[tagIndex] = update as Tag;
-            }
+    public updateTags(tag: ViewTag): void {
+        if (this.tags_id && this.tags_id.includes(tag.id)) {
+            const tagIndex = this.tags.findIndex(_tag => _tag.id === tag.id);
+            this.tags[tagIndex] = tag;
         }
     }
 
-    public updateParent(update: Motion): void {
-        if (this.motion) {
-            if (this.parent_id && this.parent_id === update.id) {
-                this._parent = update as Motion;
-            }
+    public updateParent(parent: ViewMotion): void {
+        if (this.parent_id && this.parent_id === parent.id) {
+            this._parent = parent;
         }
     }
 
diff --git a/client/src/app/site/motions/models/view-statute-paragraph.ts b/client/src/app/site/motions/models/view-statute-paragraph.ts
index 7a3b3401c..fd21b4fc0 100644
--- a/client/src/app/site/motions/models/view-statute-paragraph.ts
+++ b/client/src/app/site/motions/models/view-statute-paragraph.ts
@@ -1,7 +1,7 @@
 import { BaseViewModel } from '../../base/base-view-model';
-import { Group } from 'app/shared/models/users/group';
-import { BaseModel } from 'app/shared/models/base/base-model';
 import { StatuteParagraph } from 'app/shared/models/motions/statute-paragraph';
+import { Searchable } from 'app/site/base/searchable';
+import { SearchRepresentation } from 'app/core/ui-services/search.service';
 
 /**
  * State paragrpah class for the View
@@ -10,7 +10,7 @@ import { StatuteParagraph } from 'app/shared/models/motions/statute-paragraph';
  * Provides "safe" access to variables and functions in {@link StatuteParagraph}
  * @ignore
  */
-export class ViewStatuteParagraph extends BaseViewModel {
+export class ViewStatuteParagraph extends BaseViewModel implements Searchable {
     private _paragraph: StatuteParagraph;
 
     public get statuteParagraph(): StatuteParagraph {
@@ -18,23 +18,23 @@ export class ViewStatuteParagraph extends BaseViewModel {
     }
 
     public get id(): number {
-        return this.statuteParagraph ? this.statuteParagraph.id : null;
+        return this.statuteParagraph.id;
     }
 
     public get title(): string {
-        return this.statuteParagraph ? this.statuteParagraph.title : null;
+        return this.statuteParagraph.title;
     }
 
     public get text(): string {
-        return this.statuteParagraph ? this.statuteParagraph.text : null;
+        return this.statuteParagraph.text;
     }
 
     public get weight(): number {
-        return this.statuteParagraph ? this.statuteParagraph.weight : null;
+        return this.statuteParagraph.weight;
     }
 
     public constructor(paragraph: StatuteParagraph) {
-        super();
+        super('Statute paragraph');
         this._paragraph = paragraph;
     }
 
@@ -42,20 +42,19 @@ export class ViewStatuteParagraph extends BaseViewModel {
         return this.title;
     }
 
+    public formatForSearch(): SearchRepresentation {
+        throw new Error('TODO');
+    }
+
+    public getDetailStateURL(): string {
+        throw new Error('TODO');
+    }
+
     /**
      * Updates the local objects if required
      * @param section
      */
-    public updateValues(paragraph: BaseModel): void {
-        if (paragraph instanceof StatuteParagraph) {
-            this._paragraph = paragraph as StatuteParagraph;
-        }
-    }
-
-    // TODO: Implement updating of groups
-    public updateGroup(group: Group): void {
-        console.log(this._paragraph, group);
-    }
+    public updateDependencies(update: BaseViewModel): void {}
 
     /**
      * Duplicate this motion into a copy of itself
diff --git a/client/src/app/site/motions/models/view-workflow.ts b/client/src/app/site/motions/models/view-workflow.ts
index d284c7bff..1990353a8 100644
--- a/client/src/app/site/motions/models/view-workflow.ts
+++ b/client/src/app/site/motions/models/view-workflow.ts
@@ -1,49 +1,41 @@
 import { Workflow } from 'app/shared/models/motions/workflow';
 import { WorkflowState } from 'app/shared/models/motions/workflow-state';
 import { BaseViewModel } from '../../base/base-view-model';
-import { Deserializable } from 'app/shared/models/base/deserializable';
 
 /**
- * class for the ViewWorkflow. Currently only a basic stub
- *
- * Stores a Category including all (implicit) references
- * Provides "safe" access to variables and functions in {@link Category}
+ * class for the ViewWorkflow.
  * @ignore
  */
 export class ViewWorkflow extends BaseViewModel {
     private _workflow: Workflow;
 
-    public constructor(workflow?: Workflow) {
-        super();
-        this._workflow = workflow;
-    }
-
     public get workflow(): Workflow {
         return this._workflow;
     }
 
     public get id(): number {
-        return this.workflow ? this.workflow.id : null;
+        return this.workflow.id;
     }
 
     public get name(): string {
-        return this.workflow ? this.workflow.name : null;
+        return this.workflow.name;
     }
 
     public get states(): WorkflowState[] {
-        return this.workflow ? this.workflow.states : null;
+        return this.workflow.states;
     }
 
     public get first_state_id(): number {
-        return this.workflow ? this.workflow.first_state_id : null;
+        return this.workflow.first_state_id;
     }
 
     public get firstState(): WorkflowState {
-        return this.workflow ? this.workflow.firstState : null;
+        return this.getStateById(this.first_state_id);
     }
 
-    public getStateById(id: number): WorkflowState {
-        return this.workflow ? this.workflow.getStateById(id) : null;
+    public constructor(workflow: Workflow) {
+        super('Workflow');
+        this._workflow = workflow;
     }
 
     public getTitle(): string {
@@ -62,9 +54,9 @@ export class ViewWorkflow extends BaseViewModel {
      *
      * @param update
      */
-    public updateValues(update: Deserializable): void {
-        if (update instanceof Workflow) {
-            this._workflow = update;
-        }
+    public updateDependencies(update: BaseViewModel): void {}
+
+    public getStateById(id: number): WorkflowState {
+        return this.states.find(state => id === state.id);
     }
 }
diff --git a/client/src/app/site/motions/motions.config.ts b/client/src/app/site/motions/motions.config.ts
index 20423bd3f..920a239e9 100644
--- a/client/src/app/site/motions/motions.config.ts
+++ b/client/src/app/site/motions/motions.config.ts
@@ -3,7 +3,7 @@ import { Motion } from '../../shared/models/motions/motion';
 import { Category } from '../../shared/models/motions/category';
 import { Workflow } from '../../shared/models/motions/workflow';
 import { MotionCommentSection } from '../../shared/models/motions/motion-comment-section';
-import { MotionChangeReco } from '../../shared/models/motions/motion-change-reco';
+import { MotionChangeRecommendation } from '../../shared/models/motions/motion-change-reco';
 import { MotionBlock } from '../../shared/models/motions/motion-block';
 import { StatuteParagraph } from '../../shared/models/motions/statute-paragraph';
 import { MotionRepositoryService } from 'app/core/repositories/motions/motion-repository.service';
@@ -13,37 +13,60 @@ import { MotionCommentSectionRepositoryService } from 'app/core/repositories/mot
 import { MotionBlockRepositoryService } from 'app/core/repositories/motions/motion-block-repository.service';
 import { StatuteParagraphRepositoryService } from 'app/core/repositories/motions/statute-paragraph-repository.service';
 import { ChangeRecommendationRepositoryService } from 'app/core/repositories/motions/change-recommendation-repository.service';
+import { ViewCategory } from './models/view-category';
+import { ViewMotionCommentSection } from './models/view-motion-comment-section';
+import { ViewMotionChangeRecommendation } from './models/view-change-recommendation';
+import { ViewMotionBlock } from './models/view-motion-block';
+import { ViewStatuteParagraph } from './models/view-statute-paragraph';
+import { ViewMotion } from './models/view-motion';
+import { ViewWorkflow } from './models/view-workflow';
 
 export const MotionsAppConfig: AppConfig = {
     name: 'motions',
     models: [
-        { collectionString: 'motions/motion', model: Motion, searchOrder: 2, repository: MotionRepositoryService },
+        {
+            collectionString: 'motions/motion',
+            model: Motion,
+            viewModel: ViewMotion,
+            searchOrder: 2,
+            repository: MotionRepositoryService
+        },
         {
             collectionString: 'motions/category',
             model: Category,
+            viewModel: ViewCategory,
             searchOrder: 6,
             repository: CategoryRepositoryService
         },
-        { collectionString: 'motions/workflow', model: Workflow, repository: WorkflowRepositoryService },
+        {
+            collectionString: 'motions/workflow',
+            model: Workflow,
+            viewModel: ViewWorkflow,
+            repository: WorkflowRepositoryService
+        },
         {
             collectionString: 'motions/motion-comment-section',
             model: MotionCommentSection,
+            viewModel: ViewMotionCommentSection,
             repository: MotionCommentSectionRepositoryService
         },
         {
             collectionString: 'motions/motion-change-recommendation',
-            model: MotionChangeReco,
+            model: MotionChangeRecommendation,
+            viewModel: ViewMotionChangeRecommendation,
             repository: ChangeRecommendationRepositoryService
         },
         {
             collectionString: 'motions/motion-block',
             model: MotionBlock,
+            viewModel: ViewMotionBlock,
             searchOrder: 7,
             repository: MotionBlockRepositoryService
         },
         {
             collectionString: 'motions/statute-paragraph',
             model: StatuteParagraph,
+            viewModel: ViewStatuteParagraph,
             searchOrder: 9,
             repository: StatuteParagraphRepositoryService
         }
diff --git a/client/src/app/site/motions/services/local-permissions.service.ts b/client/src/app/site/motions/services/local-permissions.service.ts
index e44af9f66..3c94f05bc 100644
--- a/client/src/app/site/motions/services/local-permissions.service.ts
+++ b/client/src/app/site/motions/services/local-permissions.service.ts
@@ -67,14 +67,14 @@ export class LocalPermissionsService {
                     this.operator.hasPerms('motions.can_support') &&
                     this.configMinSupporters > 0 &&
                     motion.state.allow_support &&
-                    motion.submitters.indexOf(this.operator.user) === -1 &&
-                    motion.supporters.indexOf(this.operator.user) === -1
+                    motion.submitters.indexOf(this.operator.viewUser) === -1 &&
+                    motion.supporters.indexOf(this.operator.viewUser) === -1
                 );
             case 'unsupport':
                 if (!motion) {
                     return false;
                 }
-                return motion.state.allow_support && motion.supporters.indexOf(this.operator.user) !== -1;
+                return motion.state.allow_support && motion.supporters.indexOf(this.operator.viewUser) !== -1;
             case 'createpoll':
                 if (!motion) {
                     return false;
diff --git a/client/src/app/site/motions/services/motion-multiselect.service.ts b/client/src/app/site/motions/services/motion-multiselect.service.ts
index 615d9ea18..5754ff3bd 100644
--- a/client/src/app/site/motions/services/motion-multiselect.service.ts
+++ b/client/src/app/site/motions/services/motion-multiselect.service.ts
@@ -11,8 +11,8 @@ import { WorkflowRepositoryService } from 'app/core/repositories/motions/workflo
 import { CategoryRepositoryService } from 'app/core/repositories/motions/category-repository.service';
 import { TagRepositoryService } from 'app/core/repositories/tags/tag-repository.service';
 import { HttpService } from 'app/core/core-services/http.service';
-import { AgendaRepositoryService } from 'app/core/repositories/agenda/agenda-repository.service';
-import { Displayable } from 'app/shared/models/base/displayable';
+import { ItemRepositoryService } from 'app/core/repositories/agenda/item-repository.service';
+import { Displayable } from 'app/site/base/displayable';
 import { Identifiable } from 'app/shared/models/base/identifiable';
 import { MotionBlockRepositoryService } from 'app/core/repositories/motions/motion-block-repository.service';
 
@@ -47,7 +47,7 @@ export class MotionMultiselectService {
         private workflowRepo: WorkflowRepositoryService,
         private categoryRepo: CategoryRepositoryService,
         private tagRepo: TagRepositoryService,
-        private agendaRepo: AgendaRepositoryService,
+        private agendaRepo: ItemRepositoryService,
         private motionBlockRepo: MotionBlockRepositoryService,
         private httpService: HttpService
     ) {}
diff --git a/client/src/app/site/motions/services/motion-pdf-catalog.service.ts b/client/src/app/site/motions/services/motion-pdf-catalog.service.ts
index 879be6f42..985361af2 100644
--- a/client/src/app/site/motions/services/motion-pdf-catalog.service.ts
+++ b/client/src/app/site/motions/services/motion-pdf-catalog.service.ts
@@ -5,7 +5,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { ViewMotion, LineNumberingMode, ChangeRecoMode } from '../models/view-motion';
 import { MotionPdfService, InfoToExport } from './motion-pdf.service';
 import { ConfigService } from 'app/core/ui-services/config.service';
-import { Category } from 'app/shared/models/motions/category';
+import { ViewCategory } from '../models/view-category';
 
 /**
  * Service to export a list of motions.
@@ -127,7 +127,7 @@ export class MotionPdfCatalogService {
      */
     private createToc(motions: ViewMotion[], sorting?: string): object {
         const toc = [];
-        const categories: Category[] = this.getUniqueCategories(motions);
+        const categories: ViewCategory[] = this.getUniqueCategories(motions);
 
         // Create the toc title
         const tocTitle = {
@@ -234,10 +234,10 @@ export class MotionPdfCatalogService {
      * @param motions the list of motions
      * @returns Unique list of categories
      */
-    private getUniqueCategories(motions: ViewMotion[]): Category[] {
-        const categories: Category[] = motions
+    private getUniqueCategories(motions: ViewMotion[]): ViewCategory[] {
+        const categories: ViewCategory[] = motions
             // remove motions without category
-            .filter(motion => (motion.category ? motion : null))
+            .filter(motion => !!motion.category)
             // map motions their categories
             .map(motion => motion.category)
             // remove redundancies
diff --git a/client/src/app/site/projector/components/projector-detail/projector-detail.component.ts b/client/src/app/site/projector/components/projector-detail/projector-detail.component.ts
index 01dfcbeff..e3e6707ac 100644
--- a/client/src/app/site/projector/components/projector-detail/projector-detail.component.ts
+++ b/client/src/app/site/projector/components/projector-detail/projector-detail.component.ts
@@ -117,13 +117,15 @@ export class ProjectorDetailComponent extends BaseViewComponent implements OnIni
     }
 
     public getElementDescription(element: ProjectorElement): string {
-        if (!this.slideManager.canSlideBeMappedToModel(element.name)) {
-            return this.slideManager.getSlideVerboseName(element.name);
-        } else {
+        if (this.slideManager.canSlideBeMappedToModel(element.name)) {
             const idElement = this.slideManager.getIdentifialbeProjectorElement(element);
-            const model = this.projectorService.getModelFromProjectorElement(idElement);
-            return model.getTitle();
+            const viewModel = this.projectorService.getViewModelFromProjectorElement(idElement);
+            if (viewModel) {
+                return viewModel.getTitle();
+            }
         }
+
+        return this.slideManager.getSlideVerboseName(element.name);
     }
 
     public isProjected(obj: Projectable): boolean {
diff --git a/client/src/app/site/projector/models/view-countdown.ts b/client/src/app/site/projector/models/view-countdown.ts
index ec7a50aed..b2ba96df1 100644
--- a/client/src/app/site/projector/models/view-countdown.ts
+++ b/client/src/app/site/projector/models/view-countdown.ts
@@ -1,24 +1,25 @@
 import { Countdown } from 'app/shared/models/core/countdown';
-import { BaseProjectableModel } from 'app/site/base/base-projectable-model';
+import { BaseProjectableViewModel } from 'app/site/base/base-projectable-view-model';
 import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable';
+import { BaseViewModel } from 'app/site/base/base-view-model';
 
-export class ViewCountdown extends BaseProjectableModel {
+export class ViewCountdown extends BaseProjectableViewModel {
     private _countdown: Countdown;
 
     public get countdown(): Countdown {
-        return this._countdown ? this._countdown : null;
+        return this._countdown;
     }
 
     public get id(): number {
-        return this.countdown ? this.countdown.id : null;
+        return this.countdown.id;
     }
 
     public get description(): string {
-        return this.countdown ? this.countdown.description : null;
+        return this.countdown.description;
     }
 
-    public constructor(countdown?: Countdown) {
-        super();
+    public constructor(countdown: Countdown) {
+        super('Countdown');
         this._countdown = countdown;
     }
 
@@ -26,9 +27,7 @@ export class ViewCountdown extends BaseProjectableModel {
         return this.description;
     }
 
-    public updateValues(countdown: Countdown): void {
-        console.log('Update countdown TODO with vals:', countdown);
-    }
+    public updateDependencies(update: BaseViewModel): void {}
 
     public getSlide(): ProjectorElementBuildDeskriptor {
         return {
diff --git a/client/src/app/site/projector/models/view-projector.ts b/client/src/app/site/projector/models/view-projector.ts
index d7ebf3613..8fefab0df 100644
--- a/client/src/app/site/projector/models/view-projector.ts
+++ b/client/src/app/site/projector/models/view-projector.ts
@@ -5,55 +5,55 @@ export class ViewProjector extends BaseViewModel {
     private _projector: Projector;
 
     public get projector(): Projector {
-        return this._projector ? this._projector : null;
+        return this._projector;
     }
 
     public get id(): number {
-        return this.projector ? this.projector.id : null;
+        return this.projector.id;
     }
 
     public get name(): string {
-        return this.projector ? this.projector.name : null;
+        return this.projector.name;
     }
 
     public get elements(): ProjectorElements {
-        return this.projector ? this.projector.elements : null;
+        return this.projector.elements;
     }
 
     public get non_stable_elements(): ProjectorElements {
-        return this.projector ? this.projector.elements.filter(element => !element.stable) : null;
+        return this.projector.elements.filter(element => !element.stable);
     }
 
     public get elements_preview(): ProjectorElements {
-        return this.projector ? this.projector.elements_preview : null;
+        return this.projector.elements_preview;
     }
 
     public get elements_history(): ProjectorElements[] {
-        return this.projector ? this.projector.elements_history : null;
+        return this.projector.elements_history;
     }
 
     public get height(): number {
-        return this.projector ? this.projector.height : null;
+        return this.projector.height;
     }
 
     public get width(): number {
-        return this.projector ? this.projector.width : null;
+        return this.projector.width;
     }
 
     public get scale(): number {
-        return this.projector ? this.projector.scale : null;
+        return this.projector.scale;
     }
 
     public get scroll(): number {
-        return this.projector ? this.projector.scroll : null;
+        return this.projector.scroll;
     }
 
     public get reference_projector_id(): number {
-        return this.projector ? this.projector.reference_projector_id : null;
+        return this.projector.reference_projector_id;
     }
 
     public constructor(projector?: Projector) {
-        super();
+        super('Projector');
         this._projector = projector;
     }
 
@@ -61,7 +61,5 @@ export class ViewProjector extends BaseViewModel {
         return this.name;
     }
 
-    public updateValues(projector: Projector): void {
-        console.log('Update projector TODO with vals:', projector);
-    }
+    public updateDependencies(update: BaseViewModel): void {}
 }
diff --git a/client/src/app/site/projector/models/view-projectormessage.ts b/client/src/app/site/projector/models/view-projectormessage.ts
index 342b0964d..e682a6266 100644
--- a/client/src/app/site/projector/models/view-projectormessage.ts
+++ b/client/src/app/site/projector/models/view-projectormessage.ts
@@ -1,24 +1,25 @@
-import { BaseProjectableModel } from 'app/site/base/base-projectable-model';
+import { BaseProjectableViewModel } from 'app/site/base/base-projectable-view-model';
 import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable';
 import { ProjectorMessage } from 'app/shared/models/core/projector-message';
+import { BaseViewModel } from 'app/site/base/base-view-model';
 
-export class ViewProjectorMessage extends BaseProjectableModel {
+export class ViewProjectorMessage extends BaseProjectableViewModel {
     private _message: ProjectorMessage;
 
     public get projctormessage(): ProjectorMessage {
-        return this._message ? this._message : null;
+        return this._message;
     }
 
     public get id(): number {
-        return this.projctormessage ? this.projctormessage.id : null;
+        return this.projctormessage.id;
     }
 
     public get message(): string {
-        return this.projctormessage ? this.projctormessage.message : null;
+        return this.projctormessage.message;
     }
 
-    public constructor(message?: ProjectorMessage) {
-        super();
+    public constructor(message: ProjectorMessage) {
+        super('Message');
         this._message = message;
     }
 
@@ -26,9 +27,7 @@ export class ViewProjectorMessage extends BaseProjectableModel {
         return 'Message';
     }
 
-    public updateValues(message: ProjectorMessage): void {
-        console.log('Update message TODO with vals:', message);
-    }
+    public updateDependencies(update: BaseViewModel): void {}
 
     public getSlide(): ProjectorElementBuildDeskriptor {
         return {
diff --git a/client/src/app/site/projector/projector.config.ts b/client/src/app/site/projector/projector.config.ts
index d5b478c67..dec57c983 100644
--- a/client/src/app/site/projector/projector.config.ts
+++ b/client/src/app/site/projector/projector.config.ts
@@ -5,15 +5,29 @@ import { ProjectorMessage } from 'app/shared/models/core/projector-message';
 import { ProjectorRepositoryService } from 'app/core/repositories/projector/projector-repository.service';
 import { CountdownRepositoryService } from 'app/core/repositories/projector/countdown-repository.service';
 import { ProjectorMessageRepositoryService } from 'app/core/repositories/projector/projectormessage-repository.service';
+import { ViewProjector } from './models/view-projector';
+import { ViewCountdown } from './models/view-countdown';
+import { ViewProjectorMessage } from './models/view-projectormessage';
 
 export const ProjectorAppConfig: AppConfig = {
     name: 'projector',
     models: [
-        { collectionString: 'core/projector', model: Projector, repository: ProjectorRepositoryService },
-        { collectionString: 'core/countdown', model: Countdown, repository: CountdownRepositoryService },
+        {
+            collectionString: 'core/projector',
+            model: Projector,
+            viewModel: ViewProjector,
+            repository: ProjectorRepositoryService
+        },
+        {
+            collectionString: 'core/countdown',
+            model: Countdown,
+            viewModel: ViewCountdown,
+            repository: CountdownRepositoryService
+        },
         {
             collectionString: 'core/projector-message',
             model: ProjectorMessage,
+            viewModel: ViewProjectorMessage,
             repository: ProjectorMessageRepositoryService
         }
     ],
diff --git a/client/src/app/site/projector/services/current-list-of-of-speakers-slide.service.ts b/client/src/app/site/projector/services/current-list-of-of-speakers-slide.service.ts
index 10386b599..104b16732 100644
--- a/client/src/app/site/projector/services/current-list-of-of-speakers-slide.service.ts
+++ b/client/src/app/site/projector/services/current-list-of-of-speakers-slide.service.ts
@@ -5,7 +5,8 @@ import { IdentifiableProjectorElement } from 'app/shared/models/core/projector';
 import { ProjectorRepositoryService } from 'app/core/repositories/projector/projector-repository.service';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { SlideManager } from 'app/slides/services/slide-manager.service';
-import { AgendaBaseModel } from 'app/shared/models/base/agenda-base-model';
+import { BaseAgendaViewModel } from 'app/site/base/base-agenda-view-model';
+import { ViewItem } from 'app/site/agenda/models/view-item';
 
 /**
  */
@@ -13,7 +14,7 @@ import { AgendaBaseModel } from 'app/shared/models/base/agenda-base-model';
     providedIn: 'root'
 })
 export class CurrentListOfSpeakersSlideService {
-    private currentItemIds: { [projectorId: number]: BehaviorSubject<number | null> } = {};
+    private currentItemIds: { [projectorId: number]: BehaviorSubject<ViewItem | null> } = {};
 
     public constructor(
         private projectorService: ProjectorService,
@@ -21,9 +22,11 @@ export class CurrentListOfSpeakersSlideService {
         private slideManager: SlideManager
     ) {
         this.projectorRepo.getGeneralViewModelObservable().subscribe(projector => {
-            const itemId = this.getCurrentAgendaItemIdForProjector(projector);
-            if (this.currentItemIds[projector.id]) {
-                this.currentItemIds[projector.id].next(itemId);
+            if (projector) {
+                const item = this.getCurrentAgendaItemIdForProjector(projector);
+                if (this.currentItemIds[projector.id]) {
+                    this.currentItemIds[projector.id].next(item);
+                }
             }
         });
     }
@@ -50,10 +53,10 @@ export class CurrentListOfSpeakersSlideService {
      * @param projector The projector to observe.
      * @returns An observalbe for the agenda item id. Null, if no element with an agenda item is shown.
      */
-    public getAgendaItemIdObservable(projector: ViewProjector): Observable<number | null> {
+    public getAgendaItemObservable(projector: ViewProjector): Observable<ViewItem | null> {
         if (!this.currentItemIds[projector.id]) {
-            const itemId = this.getCurrentAgendaItemIdForProjector(projector);
-            this.currentItemIds[projector.id] = new BehaviorSubject<number | null>(itemId);
+            const item = this.getCurrentAgendaItemIdForProjector(projector);
+            this.currentItemIds[projector.id] = new BehaviorSubject<ViewItem | null>(item);
         }
         return this.currentItemIds[projector.id].asObservable();
     }
@@ -64,15 +67,14 @@ export class CurrentListOfSpeakersSlideService {
      * @param projector The projector
      * @returns The agenda item id or null, if there is no such projector element.
      */
-    private getCurrentAgendaItemIdForProjector(projector: ViewProjector): number | null {
+    private getCurrentAgendaItemIdForProjector(projector: ViewProjector): ViewItem | null {
         const nonStableElements = projector.elements.filter(element => !element.stable);
         if (nonStableElements.length > 0) {
             const nonStableElement = this.slideManager.getIdentifialbeProjectorElement(nonStableElements[0]); // The normal case is just one non stable slide
             try {
-                const model = this.projectorService.getModelFromProjectorElement(nonStableElement);
-                if (model instanceof AgendaBaseModel) {
-                    // TODO: Use repositories associated to models
-                    return (<any>model).agenda_item_id;
+                const viewModel = this.projectorService.getViewModelFromProjectorElement(nonStableElement);
+                if (viewModel instanceof BaseAgendaViewModel) {
+                    return viewModel.getAgendaItem();
                 }
             } catch (e) {
                 // make TypeScript silent.
diff --git a/client/src/app/site/projector/services/projector-data.service.ts b/client/src/app/site/projector/services/projector-data.service.ts
index 156427429..4d3eafb95 100644
--- a/client/src/app/site/projector/services/projector-data.service.ts
+++ b/client/src/app/site/projector/services/projector-data.service.ts
@@ -46,6 +46,7 @@ export class ProjectorDataService {
             Object.keys(update).forEach(_id => {
                 const id = parseInt(_id, 10);
                 if ((<{ error: string }>update[id]).error !== undefined) {
+                    console.log(update, update[_id]);
                     console.log('TODO: Why does the server sends errors on autoupdates?');
                 } else {
                     if (this.currentProjectorData[id]) {
diff --git a/client/src/app/site/site.component.ts b/client/src/app/site/site.component.ts
index 49ce81dd1..7552a8def 100644
--- a/client/src/app/site/site.component.ts
+++ b/client/src/app/site/site.component.ts
@@ -78,7 +78,7 @@ export class SiteComponent extends BaseComponent implements OnInit {
     ) {
         super();
 
-        this.operator.getObservable().subscribe(user => {
+        this.operator.getViewUserObservable().subscribe(user => {
             if (user) {
                 this.username = user.short_name;
             } else {
diff --git a/client/src/app/site/tags/models/view-tag.ts b/client/src/app/site/tags/models/view-tag.ts
index e75c728b1..a1779f1a6 100644
--- a/client/src/app/site/tags/models/view-tag.ts
+++ b/client/src/app/site/tags/models/view-tag.ts
@@ -1,5 +1,7 @@
 import { Tag } from 'app/shared/models/core/tag';
 import { BaseViewModel } from '../../base/base-view-model';
+import { SearchRepresentation } from 'app/core/ui-services/search.service';
+import { Searchable } from 'app/site/base/searchable';
 
 /**
  * Tag view class
@@ -8,35 +10,41 @@ import { BaseViewModel } from '../../base/base-view-model';
  * Provides "safe" access to variables and functions in {@link Tag}
  * @ignore
  */
-export class ViewTag extends BaseViewModel {
+export class ViewTag extends BaseViewModel implements Searchable {
     private _tag: Tag;
 
-    public constructor(tag: Tag) {
-        super();
-        this._tag = tag;
-    }
-
     public get tag(): Tag {
         return this._tag;
     }
 
     public get id(): number {
-        return this.tag ? this.tag.id : null;
+        return this.tag.id;
     }
 
     public get name(): string {
-        return this.tag ? this.tag.name : null;
+        return this.tag.name;
+    }
+
+    public constructor(tag: Tag) {
+        super('Tag');
+        this._tag = tag;
     }
 
     public getTitle(): string {
         return this.name;
     }
 
+    public formatForSearch(): SearchRepresentation {
+        return [this.name];
+    }
+
+    public getDetailStateURL(): string {
+        throw new Error('TODO');
+    }
+
     /**
      * Updates the local objects if required
      * @param update
      */
-    public updateValues(update: Tag): void {
-        this._tag = update;
-    }
+    public updateDependencies(update: BaseViewModel): void {}
 }
diff --git a/client/src/app/site/tags/tag.config.ts b/client/src/app/site/tags/tag.config.ts
index 1b0f4d0ae..361455491 100644
--- a/client/src/app/site/tags/tag.config.ts
+++ b/client/src/app/site/tags/tag.config.ts
@@ -1,8 +1,17 @@
 import { AppConfig } from '../../core/app-config';
 import { Tag } from '../../shared/models/core/tag';
 import { TagRepositoryService } from 'app/core/repositories/tags/tag-repository.service';
+import { ViewTag } from './models/view-tag';
 
 export const TagAppConfig: AppConfig = {
     name: 'tag',
-    models: [{ collectionString: 'core/tag', model: Tag, searchOrder: 8, repository: TagRepositoryService }]
+    models: [
+        {
+            collectionString: 'core/tag',
+            model: Tag,
+            viewModel: ViewTag,
+            searchOrder: 8,
+            repository: TagRepositoryService
+        }
+    ]
 };
diff --git a/client/src/app/site/users/components/password/password.component.ts b/client/src/app/site/users/components/password/password.component.ts
index 584c3f71c..6cd0469d7 100644
--- a/client/src/app/site/users/components/password/password.component.ts
+++ b/client/src/app/site/users/components/password/password.component.ts
@@ -88,9 +88,9 @@ export class PasswordComponent extends BaseViewComponent implements OnInit {
             }
         });
         if (this.userId === undefined) {
-            this.operator.getObservable().subscribe(users => {
-                if (users) {
-                    this.userId = users.id;
+            this.operator.getUserObservable().subscribe(user => {
+                if (user) {
+                    this.userId = user.id;
                     this.router.navigate([`./users/password/${this.userId}`]);
                 }
             });
@@ -146,9 +146,9 @@ export class PasswordComponent extends BaseViewComponent implements OnInit {
      * @param userId user id from the route
      */
     private setOpOwnsPage(userId: number): void {
-        this.operator.getObservable().subscribe(users => {
-            if (users) {
-                this.ownPage = +userId === +users.id;
+        this.operator.getUserObservable().subscribe(user => {
+            if (user) {
+                this.ownPage = +userId === +user.id;
                 this.canManage = this.operator.hasPerms('users.can_manage');
             }
         });
diff --git a/client/src/app/site/users/components/user-detail/user-detail.component.html b/client/src/app/site/users/components/user-detail/user-detail.component.html
index 4cb8264b8..2ac4b79e0 100644
--- a/client/src/app/site/users/components/user-detail/user-detail.component.html
+++ b/client/src/app/site/users/components/user-detail/user-detail.component.html
@@ -128,14 +128,14 @@
             <!-- Participant Number -->
             <mat-form-field
                 class="form25 force-min-with"
-                *ngIf="user.participant_number || (editUser && isAllowed('manage'))"
+                *ngIf="user.number || (editUser && isAllowed('manage'))"
             >
                 <input
                     type="text"
                     matInput
                     placeholder="{{ 'Participant number' | translate }}"
                     formControlName="number"
-                    [value]="user.participant_number"
+                    [value]="user.number"
                 />
             </mat-form-field>
         </div>
diff --git a/client/src/app/site/users/components/user-detail/user-detail.component.ts b/client/src/app/site/users/components/user-detail/user-detail.component.ts
index 6f92d9165..c0dcabf6b 100644
--- a/client/src/app/site/users/components/user-detail/user-detail.component.ts
+++ b/client/src/app/site/users/components/user-detail/user-detail.component.ts
@@ -8,7 +8,7 @@ import { TranslateService } from '@ngx-translate/core';
 
 import { BaseViewComponent } from '../../../base/base-view';
 import { DataStoreService } from 'app/core/core-services/data-store.service';
-import { genders } from 'app/shared/models/users/user';
+import { genders, User } from 'app/shared/models/users/user';
 import { Group } from 'app/shared/models/users/group';
 import { OperatorService } from 'app/core/core-services/operator.service';
 import { PromptService } from 'app/core/ui-services/prompt.service';
@@ -99,8 +99,25 @@ export class UserDetailComponent extends BaseViewComponent implements OnInit {
         private pdfService: UserPdfExportService
     ) {
         super(title, translate, matSnackBar);
-
-        this.user = new ViewUser();
+        // prevent 'undefined' to appear in the ui
+        const defaultUser: any = {};
+        // tslint:disable-next-line
+        [
+            'username',
+            'title',
+            'first_name',
+            'last_name',
+            'gender',
+            'structure_level',
+            'number',
+            'about_me',
+            'email',
+            'comment',
+            'default_password'
+        ].forEach(property => {
+            defaultUser[property] = '';
+        });
+        this.user = new ViewUser(new User(defaultUser));
         if (route.snapshot.url[0] && route.snapshot.url[0].path === 'new') {
             this.newUser = true;
             this.setEditMode(true);
@@ -112,7 +129,7 @@ export class UserDetailComponent extends BaseViewComponent implements OnInit {
                 this.ownPage = this.opOwnsPage(Number(params.id));
 
                 // observe operator to find out if we see our own page or not
-                this.operator.getObservable().subscribe(newOp => {
+                this.operator.getUserObservable().subscribe(newOp => {
                     if (newOp) {
                         this.ownPage = this.opOwnsPage(Number(params.id));
                     }
diff --git a/client/src/app/site/users/components/user-import/user-import-list.component.html b/client/src/app/site/users/components/user-import/user-import-list.component.html
index 0b86ed606..24625ff8d 100644
--- a/client/src/app/site/users/components/user-import/user-import-list.component.html
+++ b/client/src/app/site/users/components/user-import/user-import-list.component.html
@@ -222,7 +222,7 @@
                 <mat-cell *matCellDef="let entry"> {{ entry.newEntry.structure_level }} </mat-cell>
             </ng-container>
 
-            <ng-container matColumnDef="participant_number">
+            <ng-container matColumnDef="number">
                 <mat-header-cell *matHeaderCellDef translate>Participant number</mat-header-cell>
                 <mat-cell *matCellDef="let entry"> {{ entry.newEntry.user.number }} </mat-cell>
             </ng-container>
diff --git a/client/src/app/site/users/components/user-list/user-list.component.ts b/client/src/app/site/users/components/user-list/user-list.component.ts
index 9ee9b31c4..d24c813aa 100644
--- a/client/src/app/site/users/components/user-list/user-list.component.ts
+++ b/client/src/app/site/users/components/user-list/user-list.component.ts
@@ -141,7 +141,7 @@ export class UserListComponent extends ListViewBaseComponent<ViewUser> implement
                 { property: 'first_name', label: 'Given name' },
                 { property: 'last_name', label: 'Surname' },
                 { property: 'structure_level', label: 'Structure level' },
-                { property: 'participant_number', label: 'Participant number' },
+                { property: 'number', label: 'Participant number' },
                 { label: 'groups', map: user => user.groups.map(group => group.name).join(',') },
                 { property: 'comment' },
                 { property: 'is_active', label: 'Is active' },
diff --git a/client/src/app/site/users/models/view-group.ts b/client/src/app/site/users/models/view-group.ts
index 1d9b211d1..89b33fbaa 100644
--- a/client/src/app/site/users/models/view-group.ts
+++ b/client/src/app/site/users/models/view-group.ts
@@ -1,20 +1,19 @@
 import { BaseViewModel } from '../../base/base-view-model';
 import { Group } from 'app/shared/models/users/group';
-import { BaseModel } from 'app/shared/models/base/base-model';
 
 export class ViewGroup extends BaseViewModel {
     private _group: Group;
 
     public get group(): Group {
-        return this._group ? this._group : null;
+        return this._group;
     }
 
     public get id(): number {
-        return this.group ? this.group.id : null;
+        return this.group.id;
     }
 
     public get name(): string {
-        return this.group ? this.group.name : null;
+        return this.group.name;
     }
 
     /**
@@ -27,11 +26,11 @@ export class ViewGroup extends BaseViewModel {
     }
 
     public get permissions(): string[] {
-        return this.group ? this.group.permissions : null;
+        return this.group.permissions;
     }
 
     public constructor(group?: Group) {
-        super();
+        super('Group');
         this._group = group;
     }
 
@@ -70,7 +69,7 @@ export class ViewGroup extends BaseViewModel {
         return this.name;
     }
 
-    public updateValues(update: BaseModel): void {
+    public updateDependencies(update: BaseViewModel): void {
         console.log('ViewGroups wants to update Values with : ', update);
     }
 }
diff --git a/client/src/app/site/users/models/view-personal-note.ts b/client/src/app/site/users/models/view-personal-note.ts
new file mode 100644
index 000000000..0edc632b2
--- /dev/null
+++ b/client/src/app/site/users/models/view-personal-note.ts
@@ -0,0 +1,27 @@
+import { BaseViewModel } from 'app/site/base/base-view-model';
+import { PersonalNote } from 'app/shared/models/users/personal-note';
+
+export class ViewPersonalNote extends BaseViewModel {
+    private _personalNote: PersonalNote;
+
+    public get personalNote(): PersonalNote {
+        return this._personalNote ? this._personalNote : null;
+    }
+
+    public get id(): number {
+        return this.personalNote ? this.personalNote.id : null;
+    }
+
+    public constructor(personalNote?: PersonalNote) {
+        super('Personal note');
+        this._personalNote = personalNote;
+    }
+
+    public getTitle(): string {
+        return this.personalNote ? this.personalNote.toString() : null;
+    }
+
+    public updateDependencies(update: BaseViewModel): void {
+        throw new Error('Todo');
+    }
+}
diff --git a/client/src/app/site/users/models/view-user.ts b/client/src/app/site/users/models/view-user.ts
index ebcec97a7..3ce83d2df 100644
--- a/client/src/app/site/users/models/view-user.ts
+++ b/client/src/app/site/users/models/view-user.ts
@@ -1,67 +1,61 @@
 import { User } from 'app/shared/models/users/user';
-import { Group } from 'app/shared/models/users/group';
-import { BaseModel } from 'app/shared/models/base/base-model';
-import { BaseProjectableModel } from 'app/site/base/base-projectable-model';
+import { BaseProjectableViewModel } from 'app/site/base/base-projectable-view-model';
 import { ProjectorElementBuildDeskriptor } from 'app/site/base/projectable';
+import { Searchable } from 'app/site/base/searchable';
+import { SearchRepresentation } from 'app/core/ui-services/search.service';
+import { ViewGroup } from './view-group';
+import { BaseViewModel } from 'app/site/base/base-view-model';
 
-export class ViewUser extends BaseProjectableModel {
+export class ViewUser extends BaseProjectableViewModel implements Searchable {
     private _user: User;
-    private _groups: Group[];
+    private _groups: ViewGroup[];
 
     public get user(): User {
-        return this._user ? this._user : null;
+        return this._user;
     }
 
-    public get groups(): Group[] {
+    public get groups(): ViewGroup[] {
         return this._groups;
     }
 
     public get id(): number {
-        return this.user ? this.user.id : null;
+        return this.user.id;
     }
 
     public get username(): string {
-        return this.user ? this.user.username : null;
+        return this.user.username;
     }
 
     public get title(): string {
-        return this.user ? this.user.title : null;
+        return this.user.title;
     }
 
     public get first_name(): string {
-        return this.user ? this.user.first_name : null;
+        return this.user.first_name;
     }
 
     public get last_name(): string {
-        return this.user ? this.user.last_name : null;
-    }
-
-    public get full_name(): string {
-        return this.user ? this.user.full_name : null;
-    }
-
-    public get short_name(): string {
-        return this.user ? this.user.short_name : null;
+        return this.user.last_name;
     }
 
     public get email(): string {
-        return this.user ? this.user.email : null;
+        return this.user.email;
     }
 
     public get gender(): string {
-        return this.user ? this.user.gender : null;
+        return this.user.gender;
     }
 
     public get structure_level(): string {
-        return this.user ? this.user.structure_level : null;
+        return this.user.structure_level;
     }
 
-    public get participant_number(): string {
-        return this.user ? this.user.number : null;
+    public get number(): string {
+        return this.user.number;
     }
 
     public get groups_id(): number[] {
-        return this.user ? this.user.groups_id : null;
+        return this.user.groups_id;
     }
 
     /**
@@ -74,42 +68,117 @@ export class ViewUser extends BaseProjectableModel {
     }
 
     public get default_password(): string {
-        return this.user ? this.user.default_password : null;
+        return this.user.default_password;
     }
 
     public get comment(): string {
-        return this.user ? this.user.comment : null;
+        return this.user.comment;
     }
 
     public get is_present(): boolean {
-        return this.user ? this.user.is_present : null;
+        return this.user.is_present;
     }
 
     public get is_active(): boolean {
-        return this.user ? this.user.is_active : null;
+        return this.user.is_active;
     }
 
     public get is_committee(): boolean {
-        return this.user ? this.user.is_committee : null;
+        return this.user.is_committee;
     }
 
     public get about_me(): string {
-        return this.user ? this.user.about_me : null;
+        return this.user.about_me;
     }
 
     public get is_last_email_send(): boolean {
-        if (this.user && this.user.last_email_send) {
-            return true;
-        }
-        return false;
+        return this.user && !!this.user.last_email_send;
     }
 
-    public constructor(user?: User, groups?: Group[]) {
-        super();
+    // TODO read config values for "users_sort_by"
+    /**
+     * Getter for the short name (Title, given name, surname)
+     *
+     * @returns a non-empty string
+     */
+    public get short_name(): string {
+        if (!this.user) {
+            return '';
+        }
+
+        const title = this.title ? this.title.trim() : '';
+        const firstName = this.first_name ? this.first_name.trim() : '';
+        const lastName = this.last_name ? this.last_name.trim() : '';
+
+        // TODO need DS adjustment first first
+        // if (this.DS.getConfig('users_sort_by').value === 'last_name') {
+        //     if (lastName && firstName) {
+        //         shortName += `${lastName}, ${firstName}`;
+        //     } else {
+        //         shortName += lastName || firstName;
+        //     }
+        // }
+
+        let shortName = `${firstName} ${lastName}`;
+
+        if (shortName.length <= 1) {
+            // We have at least one space from the concatination of
+            // first- and lastname.
+            shortName = this.username;
+        }
+
+        if (title) {
+            shortName = `${title} ${shortName}`;
+        }
+
+        return shortName;
+    }
+
+    public get full_name(): string {
+        if (!this.user) {
+            return '';
+        }
+
+        let name = this.short_name;
+        const additions: string[] = [];
+
+        // addition: add number and structure level
+        const structure_level = this.structure_level ? this.structure_level.trim() : '';
+        if (structure_level) {
+            additions.push(structure_level);
+        }
+
+        const number = this.number ? this.number.trim() : '';
+        if (number) {
+            // TODO Translate
+            additions.push('No. ' + number);
+        }
+
+        if (additions.length > 0) {
+            name += ' (' + additions.join(' · ') + ')';
+        }
+        return name.trim();
+    }
+
+    public constructor(user: User, groups?: ViewGroup[]) {
+        super('Participant');
         this._user = user;
         this._groups = groups;
     }
 
+    /**
+     * Formats the category for search
+     *
+     * @override
+     */
+    public formatForSearch(): SearchRepresentation {
+        return [this.title, this.first_name, this.last_name, this.structure_level, this.number];
+    }
+
+    public getDetailStateURL(): string {
+        throw new Error('TODO');
+    }
+
     public getSlide(): ProjectorElementBuildDeskriptor {
         return {
             getBasicProjectorElement: () => ({
@@ -127,38 +196,25 @@ export class ViewUser extends BaseProjectableModel {
      * required by BaseViewModel. Don't confuse with the users title.
      */
     public getTitle(): string {
-        return this.user ? this.user.toString() : null;
+        return this.full_name;
     }
 
     /**
      * TODO: Implement
      */
-    public replaceGroup(newGroup: Group): void {}
+    public replaceGroup(newGroup: ViewGroup): void {}
 
-    public updateValues(update: BaseModel): void {
-        if (update instanceof Group) {
-            this.updateGroup(update as Group);
-        }
-        if (update instanceof User) {
-            this.updateUser(update as User);
+    public updateDependencies(update: BaseViewModel): void {
+        if (update instanceof ViewGroup) {
+            this.updateGroup(update);
         }
     }
 
-    public updateGroup(update: Group): void {
+    public updateGroup(group: ViewGroup): void {
         if (this.user && this.user.groups_id) {
-            if (this.user.containsGroupId(update.id)) {
-                this.replaceGroup(update);
+            if (this.user.containsGroupId(group.id)) {
+                this.replaceGroup(group);
             }
         }
     }
-    /**
-     * Updates values. Triggered through observables.
-     *
-     * @param update a new User or Group
-     */
-    public updateUser(update: User): void {
-        if (this.user.id === update.id) {
-            this._user = update;
-        }
-    }
 }
diff --git a/client/src/app/site/users/services/user-import.service.ts b/client/src/app/site/users/services/user-import.service.ts
index 5c23b4acc..779a4d94b 100644
--- a/client/src/app/site/users/services/user-import.service.ts
+++ b/client/src/app/site/users/services/user-import.service.ts
@@ -24,7 +24,7 @@ export class UserImportService extends BaseImportService<ViewUser> {
         'first_name',
         'last_name',
         'structure_level',
-        'participant_number',
+        'number',
         'groups_id',
         'comment',
         'is_active',
@@ -111,7 +111,7 @@ export class UserImportService extends BaseImportService<ViewUser> {
                         }
                     }
                     break;
-                case 'participant_number':
+                case 'number':
                     newViewUser.user.number = line[idx];
                     break;
                 default:
diff --git a/client/src/app/site/users/services/user-sort-list.service.ts b/client/src/app/site/users/services/user-sort-list.service.ts
index 3813c58bb..af9adee7c 100644
--- a/client/src/app/site/users/services/user-sort-list.service.ts
+++ b/client/src/app/site/users/services/user-sort-list.service.ts
@@ -16,7 +16,7 @@ export class UserSortListService extends BaseSortListService<ViewUser> {
             { property: 'is_present', label: 'Presence' },
             { property: 'is_active', label: 'Is active' },
             { property: 'is_committee', label: 'Is Committee' },
-            { property: 'participant_number', label: 'Number' },
+            { property: 'number', label: 'Number' },
             { property: 'structure_level', label: 'Structure level' },
             { property: 'comment' }
             // TODO email send?
diff --git a/client/src/app/site/users/users.config.ts b/client/src/app/site/users/users.config.ts
index ecea1c412..83823b0b1 100644
--- a/client/src/app/site/users/users.config.ts
+++ b/client/src/app/site/users/users.config.ts
@@ -5,13 +5,27 @@ import { PersonalNote } from '../../shared/models/users/personal-note';
 import { UserRepositoryService } from 'app/core/repositories/users/user-repository.service';
 import { GroupRepositoryService } from 'app/core/repositories/users/group-repository.service';
 import { PersonalNoteRepositoryService } from 'app/core/repositories/users/personal-note-repository.service';
+import { ViewUser } from './models/view-user';
+import { ViewGroup } from './models/view-group';
+import { ViewPersonalNote } from './models/view-personal-note';
 
 export const UsersAppConfig: AppConfig = {
     name: 'users',
     models: [
-        { collectionString: 'users/user', model: User, searchOrder: 4, repository: UserRepositoryService },
-        { collectionString: 'users/group', model: Group, repository: GroupRepositoryService },
-        { collectionString: 'users/personal-note', model: PersonalNote, repository: PersonalNoteRepositoryService }
+        {
+            collectionString: 'users/user',
+            model: User,
+            viewModel: ViewUser,
+            searchOrder: 4,
+            repository: UserRepositoryService
+        },
+        { collectionString: 'users/group', model: Group, viewModel: ViewGroup, repository: GroupRepositoryService },
+        {
+            collectionString: 'users/personal-note',
+            model: PersonalNote,
+            viewModel: ViewPersonalNote,
+            repository: PersonalNoteRepositoryService
+        }
     ],
     mainMenuEntries: [
         {
diff --git a/openslides/utils/consumers.py b/openslides/utils/consumers.py
index cbc12466c..6fa219552 100644
--- a/openslides/utils/consumers.py
+++ b/openslides/utils/consumers.py
@@ -119,9 +119,7 @@ class SiteConsumer(ProtocollAsyncJsonWebsocketConsumer):
         all_projector_data = event["data"]
         projector_data: Dict[int, Dict[str, Any]] = {}
         for projector_id in self.listen_projector_ids:
-            data = all_projector_data.get(
-                projector_id, {"error": f"No data for projector {projector_id}"}
-            )
+            data = all_projector_data.get(projector_id, [])
             new_hash = hash(str(data))
             if new_hash != self.projector_hash.get(projector_id):
                 projector_data[projector_id] = data