more update to fix data model, wip