Updated DB stuff for PSR0