Adopted to custom-serialization update.