Make restoration ID generation optional