Updated DB model