DB backend fix and enhancements