Making backup and restore better