Update serialization, convert from develop.