YES. Reworked the serialization and deserialization so that it will not
mess up hierarchies of documents that has nested members that might
fall under the conventions for entities.