Refactor model

t.knopffrequested to merge
refactor_model into develop

This MR contains additional small improvements to the Session model.

Relates to #52 (closed)

Merge request reports