Addition of classes for core database