Adding composer and base class