Added database and initial classes