Added database classes