More composition related changes.