Updated to new serialization/deserialization method