Add backup
Fix arg handling