Updated undo/redo support