Fix: Restore/Save process of instance state