ADD remaining database classes