Enriching the data-model as preparation for configuration