Refactor Models

[cknoll]

During early development the data models of the entities were introduced as string fields, because of flexibility and yet unclear requirements. This is clearly a technical debt and should be refactored when requirements (and thus the data model) have matured. Good occasion would be after the review of the inital paper.