diff --git a/focal_point.module b/focal_point.module
index c267635..861d1e6 100644
--- a/focal_point.module
+++ b/focal_point.module
@@ -19,10 +19,18 @@ use Drupal\focal_point\FocalPoint;
  * Saves the focal point value for the image file entity about to be saved.
  */
 function focal_point_entity_presave(EntityInterface $entity) {
-  if (isset($entity->field_image)) {
-    foreach($entity->field_image as $item) {
-      $focal_point = new FocalPoint($item->target_id);
-      $focal_point->saveFocalPoint($item->focal_point);
+  // Loop all the fields.
+  foreach ($entity->getFieldDefinitions() as $key => $value) {
+    // If it's type is image we continue.
+    if ($value->getType() == 'image') {
+      // Check if we have our field name.
+      if ($entity->{$value->getName()} !== null) {
+        // All is set, we now loop our value's and process the focalpoints.
+        foreach ($entity->{$value->getName()} as $item) {
+          $focal_point = new FocalPoint($item->target_id);
+          $focal_point->saveFocalPoint($item->focal_point);
+        }
+      }
     }
   }
 }