Composition engine imported from v1.1 - needs modifications because of different execution engine