Updated DB Structure