Migrate to new propagator