Enhance db.go again