Database enhancements