Support save/restore sessions