Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -r258acae55e0ae70bcc094a2f7a577b7fbc8d8f2e -r40793165416093e9d2fefb6b12acf82fbd8a84c2
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 258acae55e0ae70bcc094a2f7a577b7fbc8d8f2e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 40793165416093e9d2fefb6b12acf82fbd8a84c2)
@@ -28,10 +28,7 @@
 using Core.Common.Base;
 using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
-using Core.Components.Gis;
-using Core.Components.Gis.Data;
 using NUnit.Framework;
-using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
@@ -76,7 +73,7 @@
                 Comments = comments,
                 Norm = norm
             };
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -109,22 +106,34 @@
             const string preferredFormat = "image/png";
 
             var entity = CreateAssessmentSectionEntity();
-            BackgroundMapDataEntity backgroundMapDataEntity = new BackgroundMapDataEntity
+            BackgroundDataEntity backgroundDataEntity = new BackgroundDataEntity
             {
                 Name = mapDataName,
                 Transparency = transparency,
-                IsVisible = Convert.ToByte(isVisible)
+                IsVisible = Convert.ToByte(isVisible),
+                IsConfigured = Convert.ToByte(isConfigured),
+                BackgroundDataMetaEntities = new List<BackgroundDataMetaEntity>
+                {
+                    new BackgroundDataMetaEntity
+                    {
+                        Key = BackgroundDataIdentifiers.SourceCapabilitiesUrl,
+                        Value = sourceCapabilitiesUrl
+                    },
+                    new BackgroundDataMetaEntity
+                    {
+                        Key = BackgroundDataIdentifiers.SelectedCapabilityIdentifier,
+                        Value = selectedCapabilityName
+                    },
+                    new BackgroundDataMetaEntity
+                    {
+                        Key = BackgroundDataIdentifiers.PreferredFormat,
+                        Value = preferredFormat
+                    }
+                }
             };
 
-            if (isConfigured)
-            {                
-                backgroundMapDataEntity.SourceCapabilitiesUrl = sourceCapabilitiesUrl;
-                backgroundMapDataEntity.SelectedCapabilityName = selectedCapabilityName;
-                backgroundMapDataEntity.PreferredFormat = preferredFormat;
-            }
+            entity.BackgroundDataEntities.Add(backgroundDataEntity);
 
-            entity.BackgroundMapDataEntities.Add(backgroundMapDataEntity);
-
             var collector = new ReadConversionCollector();
 
             // Call
@@ -167,7 +176,7 @@
                 new Point2D(secondX, secondY)
             };
             entity.ReferenceLinePointXml = new Point2DXmlSerializer().ToXml(points);
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -199,7 +208,7 @@
                 Name = "B",
                 Order = 0
             });
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -247,7 +256,7 @@
                 }
             };
             entity.FailureMechanismEntities.Add(failureMechanismEntity);
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -296,7 +305,7 @@
                 }
             };
             entity.FailureMechanismEntities.Add(failureMechanismEntity);
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -342,7 +351,7 @@
                 }
             };
             entity.FailureMechanismEntities.Add(failureMechanismEntity);
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -383,7 +392,7 @@
                 }
             };
             entity.FailureMechanismEntities.Add(failureMechanismEntity);
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -423,7 +432,7 @@
             });
 
             entity.FailureMechanismEntities.Add(failureMechanismEntity);
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -463,7 +472,7 @@
                 }
             };
             entity.FailureMechanismEntities.Add(failureMechanismEntity);
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -510,7 +519,7 @@
                 }
             };
             entity.FailureMechanismEntities.Add(failureMechanismEntity);
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -543,7 +552,7 @@
                 CalculationGroupEntity = rootGroupEntity
             };
             entity.FailureMechanismEntities.Add(failureMechanismEntity);
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -583,7 +592,7 @@
                 }
             };
             entity.FailureMechanismEntities.Add(failureMechanismEntity);
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -630,7 +639,7 @@
                 }
             };
             entity.FailureMechanismEntities.Add(failureMechanismEntity);
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -678,7 +687,7 @@
                 }
             };
             entity.FailureMechanismEntities.Add(failureMechanismEntity);
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -715,7 +724,7 @@
                 NotRelevantComments = notRelevantComments
             };
             entity.FailureMechanismEntities.Add(failureMechanismEntity);
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -754,7 +763,7 @@
                 }
             };
             entity.FailureMechanismEntities.Add(failureMechanismEntity);
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -798,7 +807,7 @@
                 IsRelevant = Convert.ToByte(isRelevant)
             };
             entity.FailureMechanismEntities.Add(failureMechanismEntity);
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -835,7 +844,7 @@
                 NotRelevantComments = notRelevantComments
             };
             entity.FailureMechanismEntities.Add(failureMechanismEntity);
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -878,7 +887,7 @@
                 }
             };
             entity.FailureMechanismEntities.Add(failureMechanismEntity);
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -919,7 +928,7 @@
                 }
             };
             entity.FailureMechanismEntities.Add(failureMechanismEntity);
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -959,7 +968,7 @@
                 }
             };
             entity.FailureMechanismEntities.Add(failureMechanismEntity);
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -1001,7 +1010,7 @@
                 }
             };
             entity.FailureMechanismEntities.Add(failureMechanismEntity);
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -1043,7 +1052,7 @@
                 }
             };
             entity.FailureMechanismEntities.Add(failureMechanismEntity);
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -1084,7 +1093,7 @@
                 }
             };
             entity.FailureMechanismEntities.Add(failureMechanismEntity);
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -1117,7 +1126,7 @@
                 }
             };
             entity.FailureMechanismEntities.Add(failureMechanismEntity);
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -1161,7 +1170,7 @@
             entity.FailureMechanismEntities.Add(grassRevetmentSlidingOutwards);
             entity.FailureMechanismEntities.Add(grassRevetmentSlidingInwards);
             entity.FailureMechanismEntities.Add(technicalInnovations);
-            entity.BackgroundMapDataEntities.Add(CreateBackgroundMapDataEntity());
+            entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
 
             var collector = new ReadConversionCollector();
 
@@ -1202,9 +1211,9 @@
             };
         }
 
-        private static BackgroundMapDataEntity CreateBackgroundMapDataEntity()
+        private static BackgroundDataEntity CreateBackgroundDataEntity()
         {
-            return new BackgroundMapDataEntity
+            return new BackgroundDataEntity
             {
                 Name = "Background",
                 Transparency = 0.0,