added database classes
merged