Added core classes