Option serialization updates