Replace some code with static-engine/compose
3.1.0