added on save/restore instance state