Improvements to the backup plugin