Changes to database classes