Updated DB SChema