Composer improvements