Merge "Refactor datamodel"