More serialization work.