Rework data propagation mechanisms