Update to documentation and minor serialization update