Fix : add backup service and make undo safer