Improve database classes
6 files changed