Added composition stuff.