major changes in database classes