adapt to new serialization infrastructure