Update to work with latest Dynflow