Added a core class