Update for latest serialization changes.