Added core classes/categories