diff --git a/js/masonry.js b/js/masonry.js
index 057f291..a9fca94 100644
--- a/js/masonry.js
+++ b/js/masonry.js
@@ -6,56 +6,17 @@
  */
 
 (function ($, Drupal, drupalSettings) {
-  'use strict';
 
   Drupal.behaviors.masonry = {
-    attach: function (context) {
+    attach: function (context, settings) {
 
-      /**
-       * (internal) Sub-function for code factoring: actually build masonry.
-       */
-      function _buildMasonry($container, options) {
-        // If no masonry find in container: init it...
-        if ($container.findOnce('masonry').length === 0) {
-          $container.once('masonry').addClass('masonry').masonry(options);
-          $(window).resize(function () {
-            $container.findOnce('masonry').masonry('bindResize');
-          });
-        } else {
-          // ...otherwise, simply rebuild the layout.
-          $container.masonry('reloadItems').masonry('layout');
-        }
-
-        // Hack to support lazysizes lazy loading.
-        if (options.imagesLazyLoad) {
-          let lastClassState = false;
-          const observer = new MutationObserver(function(mutationsList) {
-            mutationsList.forEach(function(mutation) {
-              if (mutation.type === 'attributes' && mutation.attributeName === 'class') {
-                let currentClassState = mutation.target.classList.contains(options.lazyloadedSelector);
-
-                if (lastClassState !== currentClassState) {
-                  lastClassState = currentClassState;
-
-                  if (currentClassState) {
-                    if (options.imagesFirst) {
-                      $container.imagesLoaded(function () {
-                        $container.masonry('reloadItems').masonry('layout');
-                      });
-                    } else {
-                      $container.masonry('reloadItems').masonry('layout');
-                    }
-                  }
-                }
-              }
-            });
-          });
+      // Apply Masonry on the page.
+      applyMasonry();
 
-          $('img.' + options.lazyloadSelector, $container).once('imgloaded').each(function() {
-            observer.observe(this, { attributes: true });
-          });
-        }
-      }
+      // Hack for tabs: when the tab is open, it takes to reload Masonry.
+      $('a[data-toggle="tab"]', context).on('shown.bs.tab', function () {
+        applyMasonry();
+      });
 
       /**
        * Apply Masonry.
@@ -66,62 +27,53 @@
         $.each(drupalSettings.masonry, function (container, settings) {
 
           // Set container.
-          const $container = $(container);
+          var $container = $(container);
 
           // Set options.
-          const options = {};
+          var $options = {};
 
           // Sets the item selector.
           if (settings.item_selector) {
-            options.itemSelector = settings.item_selector;
+            $options.itemSelector = settings.item_selector;
             // Add custom class to all items.
-            $(settings.item_selector, $container).addClass('masonry-item');
+            $(settings.item_selector).addClass('masonry-item');
           }
 
           // Apply column width units accordingly.
           if (settings.column_width) {
-            if (settings.column_width_units === 'px') {
-              options.columnWidth = parseInt(settings.column_width);
+            if (settings.column_width_units == 'px') {
+              $options.columnWidth = parseInt(settings.column_width);
             }
-            else if (settings.column_width_units === '%') {
-              options.columnWidth = ($container.width() * (settings.column_width / 100)) - settings.gutter_width;
+            else if (settings.column_width_units == '%') {
+              $options.columnWidth = ($container.width() * (settings.column_width / 100)) - settings.gutter_width;
             }
             else {
-              options.columnWidth = settings.column_width;
+              $options.columnWidth = settings.column_width;
             }
           }
 
           // Add stamped selector.
           if (settings.stamp) {
-            options.stamp = settings.stamp;
+            $options.stamp = settings.stamp;
           }
 
           // Add the various options.
-          options.gutter = settings.gutter_width;
-          options.isResizeBound = settings.resizable;
-          options.isFitWidth = settings.fit_width;
-          options.imagesFirst = settings.images_first;
-          options.imagesLazyLoad = settings.images_lazyload;
-          options.lazyloadSelector = settings.lazyload_selector;
-          options.lazyloadedSelector = settings.lazyloaded_selector;
+          $options.gutter = settings.gutter_width;
+          $options.isResizeBound = settings.resizable;
+          $options.isFitWidth = settings.fit_width;
           if (settings.rtl) {
-            options.isOriginLeft = false;
+            $options.isOriginLeft = false;
           }
           if (settings.animated) {
-            options.transitionDuration = settings.animation_duration + 'ms';
+            $options.transitionDuration = settings.animation_duration + 'ms';
           }
           else {
-            options.transitionDuration = 0;
+            $options.transitionDuration = 0;
           }
           if (settings.percent_position) {
-            options.percentPosition = true;
+            $options.percentPosition = true;
           }
 
-          // Include the extra options.
-          $.each(settings.extra_options, function (option, value) {
-            options[option] = value;
-          });
-
           /**
            * Apply Masonry to container.
            */
@@ -129,25 +81,28 @@
           // Load images first if necessary.
           if (settings.images_first) {
             $container.imagesLoaded(function () {
-              _buildMasonry($container, options);
+              if ($container.findOnce('masonry').length === 0) {
+                $container.once('masonry').addClass('masonry').masonry($options);
+                $(window).resize(function () {
+                  $container.findOnce('masonry').masonry('bindResize')
+                });
+              }
+              $container.masonry('reloadItems').masonry('layout');
             });
           }
 
           // Apply without loading images first otherwise.
           else {
-            _buildMasonry($container, options);
+            if ($container.findOnce('masonry').length === 0) {
+              $container.once('masonry').addClass('masonry').masonry($options);
+              $(window).resize(function () {
+                $container.findOnce('masonry').masonry('bindResize')
+              });
+            }
+            $container.masonry('reloadItems').masonry('layout');
           }
         });
       }
-
-      // Apply Masonry on the page.
-      applyMasonry();
-
-      // Hack for tabs: when the tab is open, it takes to reload Masonry.
-      $('a[data-toggle="tab"]', context).on('shown.bs.tab', function () {
-        applyMasonry();
-      });
-
     }
   };
 })(jQuery, Drupal, drupalSettings);