Added the new classes for the new database.