More serialization re-work. *BREAKING CHANGES*