More composer related changes