Update for serialization

Update reflects new serialization ability.