Switch to using db.go functions