Updated DB Schema