Updated DB Model