almost final changes on the data model