Add batch actions and snapshot save/restore