Database class enhancements