Migrate to new propagator, code maintainance