Adding CNClasses and CNBatches