Update data model and services