Adding core classes