Updated data model, first full version