Integrated Undo strategy