Updated DB loader