Added classes and composer