Added core classes and composer