Updated DB-layout
Updated DB-layout