DB enhancements