Increased the capability/coverage of DatastoreXmlExternalizer