diff --git a/mapstore2_adapter/plugins/serializers.py b/mapstore2_adapter/plugins/serializers.py
index 6b8985f..9afe4c1 100644
--- a/mapstore2_adapter/plugins/serializers.py
+++ b/mapstore2_adapter/plugins/serializers.py
@@ -139,7 +139,12 @@ def decode_base64(data):
                 if _a['name'] == 'abstract' and 'value' in _a:
                     _map_abstract = _a['value']
                 if 'thumb' in _a['name'] and 'value' in _a:
-                    (_map_thumbnail, _map_thumbnail_format) = decode_base64(_a['value'])
+                    try:
+                        (_map_thumbnail, _map_thumbnail_format) = decode_base64(_a['value'])
+                    except Exception:
+                        if _a['value']:
+                            _map_thumbnail = _a['value']
+                            _map_thumbnail_format = 'link'
         elif map_obj:
             _map_title = map_obj.title
             _map_abstract = map_obj.abstract
@@ -284,8 +289,11 @@ def decode_base64(data):
 
                     # Dumps thumbnail from MapStore2 Interface
                     if _map_thumbnail:
-                        _map_thumbnail_filename = "map-%s-thumb.%s" % (map_obj.uuid, _map_thumbnail_format)
-                        map_obj.save_thumbnail(_map_thumbnail_filename, _map_thumbnail)
+                        if _map_thumbnail_format == 'link':
+                            map_obj.thumbnail_url = _map_thumbnail
+                        else:
+                            _map_thumbnail_filename = "map-%s-thumb.%s" % (map_obj.uuid, _map_thumbnail_format)
+                            map_obj.save_thumbnail(_map_thumbnail_filename, _map_thumbnail)
 
                     serializer.validated_data['id'] = map_obj.id
                     serializer.save(user=caller.request.user)
@@ -297,30 +305,33 @@ def decode_base64(data):
             raise APIException("Map Configuration (data) is Mandatory!")
 
     def perform_create(self, caller, serializer):
-        map_obj = self.get_geonode_map(caller, serializer)
-
         _data = None
         _attributes = None
 
-        if 'data' in serializer.validated_data:
-            _data = serializer.validated_data.pop('data', None)
-        else:
+        try:
+            _data = serializer.validated_data['data'].copy()
+            serializer.validated_data.pop('data')
+        except Exception as e:
+            logger.exception(e)
             raise APIException("Map Configuration (data) is Mandatory!")
 
-        if 'attributes' in serializer.validated_data:
-            _attributes = serializer.validated_data.pop('attributes', None)
-        else:
+        try:
+            _attributes = serializer.validated_data['attributes'].copy()
+            serializer.validated_data.pop('attributes')
+        except Exception as e:
+            logger.exception(e)
             raise APIException("Map Metadata (attributes) are Mandatory!")
 
-        self.set_geonode_map(caller, serializer, map_obj, _data, _attributes)
+        map_obj = self.get_geonode_map(caller, serializer)
+        self.set_geonode_map(caller, serializer, map_obj, _data.copy(), _attributes.copy())
 
         if _data:
             # Save JSON blob
-            GeoNodeSerializer.update_data(serializer, _data)
+            GeoNodeSerializer.update_data(serializer, _data.copy())
 
         if _attributes:
             # Sabe Attributes
-            GeoNodeSerializer.update_attributes(serializer, _attributes)
+            GeoNodeSerializer.update_attributes(serializer, _attributes.copy())
 
         return serializer.save()
 
@@ -331,16 +342,18 @@ def perform_update(self, caller, serializer):
         _attributes = None
 
         if 'data' in serializer.validated_data:
-            _data = serializer.validated_data.pop('data', None)
+            _data = serializer.validated_data['data'].copy()
+            serializer.validated_data.pop('data')
 
             # Save JSON blob
-            GeoNodeSerializer.update_data(serializer, _data)
+            GeoNodeSerializer.update_data(serializer, _data.copy())
 
         if 'attributes' in serializer.validated_data:
-            _attributes = serializer.validated_data.pop('attributes', None)
+            _attributes = serializer.validated_data['attributes'].copy()
+            serializer.validated_data.pop('attributes')
 
             # Sabe Attributes
-            GeoNodeSerializer.update_attributes(serializer, _attributes)
+            GeoNodeSerializer.update_attributes(serializer, _attributes.copy())
 
         self.set_geonode_map(caller, serializer, map_obj, _data, _attributes)