Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Ringtoets.AssemblyTool.IO.csproj
===================================================================
diff -u -r2cdd64c04b5525258950cf336810e447bb763740 -r460f9df20ddc6cb2ef731fad1b67dab412988761
--- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Ringtoets.AssemblyTool.IO.csproj	(.../Ringtoets.AssemblyTool.IO.csproj)	(revision 2cdd64c04b5525258950cf336810e447bb763740)
+++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Ringtoets.AssemblyTool.IO.csproj	(.../Ringtoets.AssemblyTool.IO.csproj)	(revision 460f9df20ddc6cb2ef731fad1b67dab412988761)
@@ -24,8 +24,9 @@
     <Compile Include="Model\SerializableAssessmentProcess.cs" />
     <Compile Include="Model\SerializableLine.cs" />
     <Compile Include="Model\SerializableLineString.cs" />
+    <Compile Include="Model\SerializableMeasure.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Model\Assembly.cs" />
+    <Compile Include="Model\SerializableAssembly.cs" />
     <Compile Include="Model\SerializableFeatureMember.cs" />
   </ItemGroup>
   <ItemGroup>
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/Gml/SerializableBoundaryTest.cs
===================================================================
diff -u -r8dc5fd4ca0f4a2b44a65d1f7995fdc652919694d -r460f9df20ddc6cb2ef731fad1b67dab412988761
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/Gml/SerializableBoundaryTest.cs	(.../SerializableBoundaryTest.cs)	(revision 8dc5fd4ca0f4a2b44a65d1f7995fdc652919694d)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/Gml/SerializableBoundaryTest.cs	(.../SerializableBoundaryTest.cs)	(revision 460f9df20ddc6cb2ef731fad1b67dab412988761)
@@ -33,10 +33,10 @@
         public void DefaultConstructor_ReturnsDefaultValues()
         {
             // Call
-            var boundaries = new SerializableBoundary();
+            var boundary = new SerializableBoundary();
 
             // Assert
-            Assert.IsNull(boundaries.Envelope);
+            Assert.IsNull(boundary.Envelope);
 
             SerializableAttributeTestHelper.AssertXmlElementAttribute<SerializableBoundary>(
                 nameof(SerializableBoundary.Envelope), "Envelope");
@@ -79,11 +79,11 @@
             var upperCorner = new Point2D(random.NextDouble(), random.NextDouble());
 
             // Call
-            var boundaries = new SerializableBoundary(lowerCorner, upperCorner);
+            var boundary = new SerializableBoundary(lowerCorner, upperCorner);
 
             // Assert
-            Assert.AreEqual(lowerCorner.X + " " + lowerCorner.Y, boundaries.Envelope.LowerCorner);
-            Assert.AreEqual(upperCorner.X + " " + upperCorner.Y, boundaries.Envelope.UpperCorner);
+            Assert.AreEqual(lowerCorner.X + " " + lowerCorner.Y, boundary.Envelope.LowerCorner);
+            Assert.AreEqual(upperCorner.X + " " + upperCorner.Y, boundary.Envelope.UpperCorner);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssemblyTest.cs
===================================================================
diff -u -r2cdd64c04b5525258950cf336810e447bb763740 -r460f9df20ddc6cb2ef731fad1b67dab412988761
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssemblyTest.cs	(.../SerializableAssemblyTest.cs)	(revision 2cdd64c04b5525258950cf336810e447bb763740)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssemblyTest.cs	(.../SerializableAssemblyTest.cs)	(revision 460f9df20ddc6cb2ef731fad1b67dab412988761)
@@ -75,9 +75,9 @@
 
             // Call
             TestDelegate call = () => new SerializableAssembly(null,
-                                                   new Point2D(random.NextDouble(), random.NextDouble()),
-                                                   new Point2D(random.NextDouble(), random.NextDouble()),
-                                                   new List<SerializableFeatureMember>());
+                                                               new Point2D(random.NextDouble(), random.NextDouble()),
+                                                               new Point2D(random.NextDouble(), random.NextDouble()),
+                                                               new List<SerializableFeatureMember>());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -92,9 +92,9 @@
 
             // Call
             TestDelegate call = () => new SerializableAssembly(string.Empty,
-                                                   null,
-                                                   new Point2D(random.NextDouble(), random.NextDouble()),
-                                                   new List<SerializableFeatureMember>());
+                                                               null,
+                                                               new Point2D(random.NextDouble(), random.NextDouble()),
+                                                               new List<SerializableFeatureMember>());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -109,9 +109,9 @@
 
             // Call
             TestDelegate call = () => new SerializableAssembly(string.Empty,
-                                                   new Point2D(random.NextDouble(), random.NextDouble()),
-                                                   null,
-                                                   new List<SerializableFeatureMember>());
+                                                               new Point2D(random.NextDouble(), random.NextDouble()),
+                                                               null,
+                                                               new List<SerializableFeatureMember>());
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
             Assert.AreEqual("upperCorner", exception.ParamName);
@@ -125,9 +125,9 @@
 
             // Call
             TestDelegate call = () => new SerializableAssembly(string.Empty,
-                                                   new Point2D(random.NextDouble(), random.NextDouble()),
-                                                   new Point2D(random.NextDouble(), random.NextDouble()),
-                                                   null);
+                                                               new Point2D(random.NextDouble(), random.NextDouble()),
+                                                               new Point2D(random.NextDouble(), random.NextDouble()),
+                                                               null);
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
             Assert.AreEqual("featureMembers", exception.ParamName);
@@ -146,12 +146,12 @@
 
             // Call
             var assembly = new SerializableAssembly(id,
-                                        lowerCorner,
-                                        upperCorner,
-                                        new List<SerializableFeatureMember>
-                                        {
-                                            featureMember
-                                        });
+                                                    lowerCorner,
+                                                    upperCorner,
+                                                    new List<SerializableFeatureMember>
+                                                    {
+                                                        featureMember
+                                                    });
             // Assert
             Assert.AreEqual(id, assembly.Id);
             Assert.AreEqual(lowerCorner.X + " " + lowerCorner.Y, assembly.Boundary.Envelope.LowerCorner);
@@ -172,7 +172,11 @@
             var assessmentSection = new SerializableAssessmentSection
             {
                 Id = "section1",
-                Length = 100,
+                Length = new SerializableMeasure
+                {
+                    UnitOfMeasure = "m",
+                    Value = 100
+                },
                 Name = "Traject A",
                 SurfaceLineGeometry = new SerializableLine(new[]
                 {
@@ -182,10 +186,10 @@
             };
 
             var assembly = new SerializableAssembly("assembly_1", new Point2D(12.0, 34.0), new Point2D(56.0, 78.0),
-                                        new List<SerializableFeatureMember>
-                                        {
-                                            assessmentSection
-                                        });
+                                                    new List<SerializableFeatureMember>
+                                                    {
+                                                        assessmentSection
+                                                    });
 
             serializer.Serialize(writer, assembly, xmlns);
             Console.WriteLine(writer.ToString());
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Ringtoets.AssemblyTool.IO.Test.csproj
===================================================================
diff -u -r2cdd64c04b5525258950cf336810e447bb763740 -r460f9df20ddc6cb2ef731fad1b67dab412988761
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Ringtoets.AssemblyTool.IO.Test.csproj	(.../Ringtoets.AssemblyTool.IO.Test.csproj)	(revision 2cdd64c04b5525258950cf336810e447bb763740)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Ringtoets.AssemblyTool.IO.Test.csproj	(.../Ringtoets.AssemblyTool.IO.Test.csproj)	(revision 460f9df20ddc6cb2ef731fad1b67dab412988761)
@@ -15,7 +15,8 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Model\AssemblyTest.cs" />
+    <Compile Include="Model\SerializableMeasureTest.cs" />
+    <Compile Include="Model\SerializableAssemblyTest.cs" />
     <Compile Include="Model\Gml\SerializableEnvelopeTest.cs" />
     <Compile Include="Model\Gml\SerializableBoundaryTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />