Finalized switch from clone to stored serialized state