Changes to support full support for sub-documents in persistor