Added core class