Make backup now optional