data model adjustments