Composer: Improved