Updated database classes.