Updating the serialization and deserialization code.
Fixing a minor deserialization bug.