updated database classes