Add core classes2