#386 updated db model (wip)