Implementation of new data model + first API version
pre-merge master
Merge complete