Added remaining classes to database code.