Some rework of Composer