Add core classes