Updated DB Class