App model changes for backup / restore