Adding composer logic