Updated DB strcture