data model some fix