Adding database classes (started)