diff --git a/content_sync.batch.inc b/content_sync.batch.inc
index 4b9e7ad..7d594b0 100644
--- a/content_sync.batch.inc
+++ b/content_sync.batch.inc
@@ -313,6 +313,9 @@ function processContentDirectoryBatch($files, $collection, $operation, &$context
          // Get the  parent entity id and exchange it for the uuid.
          $record['values']['parent'] = $entity->id();
        }
+       else {
+         $record['values']['parent'] = $parent_uuid;
+       }
      }
 
      // Password exception for users
@@ -651,10 +654,20 @@ function _content_sync_db_to_entity($entity_type,$entity_bundle,$entity_id){
   foreach ($entity_elements as $elementID => $element) {
     //Include parent UUID if it exist
     if ($element == 'parent') {
-      $parent = $entityTypeManager->getStorage($entity_type)->loadParents($entity_id);
-      $parent = reset($parent);
-      if ( !empty($parent) ) {
-        $entity['values'][0][$element] = $parent->uuid();
+      $entity_type_manager = $entityTypeManager->getStorage($entity_type);
+      if (method_exists($entity_type_manager, 'loadParents')) {
+        $parent = $entity_type_manager->loadParents($entity_id);
+        // $parent = $entityTypeManager->getStorage($entity_type)->loadParents($entity_id);
+        $parent = reset($parent);
+        if ( !empty($parent) ) {
+          $entity['values'][0][$element] = $parent->uuid();
+        }
+      }
+      else if (method_exists($entity_data, 'getParentId')) {
+        $parent = $entity_data->getParentId();
+        if ( !empty($parent) ) {
+          $entity['values'][0][$element] = $parent;
+        }
       }
     }else {
       $entity['values'][0][$element] = $entity_data->get($element)
@@ -772,4 +785,4 @@ function generateSiteUUIDFile($data, &$context) {
   $context['message'] = $name;
   $context['results'][] = $name;
   $context['finished'] = 1;
-}
\ No newline at end of file
+}