Updated DB class