Updated Disjoint Composer and new Recomposer