Improved handling of backup