first fix of data model