Update for new db interface