Added composition controller to core