More composer improvements