Add rework macro