Index: stable/HeuristicLab.Analysis/3.3/DataVisualization/DataRow.cs
===================================================================
--- stable/HeuristicLab.Analysis/3.3/DataVisualization/DataRow.cs	(revision 16838)
+++ stable/HeuristicLab.Analysis/3.3/DataVisualization/DataRow.cs	(revision 17097)
@@ -1,5 +1,5 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -26,5 +26,5 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis {
@@ -33,5 +33,5 @@
   /// </summary>
   [Item("DataRow", "A row of data values.")]
-  [StorableClass]
+  [StorableType("34A66F23-0FBB-414C-81C8-D3AA1C470446")]
   public class DataRow : NamedItem , IDataRow {
     private DataRowVisualProperties visualProperties;
@@ -70,5 +70,5 @@
 
     [StorableConstructor]
-    protected DataRow(bool deserializing) : base(deserializing) { }
+    protected DataRow(StorableConstructorFlag _) : base(_) { }
     protected DataRow(DataRow original, Cloner cloner)
       : base(original, cloner) {
Index: stable/HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs
===================================================================
--- stable/HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs	(revision 16838)
+++ stable/HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs	(revision 17097)
@@ -1,5 +1,5 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -24,5 +24,5 @@
 using System.Drawing;
 using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis {
@@ -30,7 +30,8 @@
   /// Visual properties of a DataRow.
   /// </summary>
-  [StorableClass]
+  [StorableType("3B28F24F-5CA7-40C2-A81C-65FCAF5B2C66")]
   public class DataRowVisualProperties : DeepCloneable, INotifyPropertyChanged {
     #region ChartType
+    [StorableType("488A018F-AF79-4B60-989A-845EF24F4A01")]
     public enum DataRowChartType {
       Line,
@@ -41,6 +42,8 @@
       StepLine
     }
+
     #endregion
     #region LineStyle
+    [StorableType("A064C2CE-D2CC-4292-B5FC-8DDCFA55C896")]
     public enum DataRowLineStyle {
       Dash,
@@ -233,5 +236,5 @@
 
     [StorableConstructor]
-    protected DataRowVisualProperties(bool deserializing) : base() { }
+    protected DataRowVisualProperties(StorableConstructorFlag _) { }
     protected DataRowVisualProperties(DataRowVisualProperties original, Cloner cloner)
       : base(original, cloner) {
Index: stable/HeuristicLab.Analysis/3.3/DataVisualization/DataTable.cs
===================================================================
--- stable/HeuristicLab.Analysis/3.3/DataVisualization/DataTable.cs	(revision 16838)
+++ stable/HeuristicLab.Analysis/3.3/DataVisualization/DataTable.cs	(revision 17097)
@@ -1,5 +1,5 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -29,5 +29,5 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis {
@@ -36,5 +36,5 @@
   /// </summary>
   [Item("DataTable", "A table of data values.")]
-  [StorableClass]
+  [StorableType("3DD78514-DBCE-4B2A-83B9-847FC67C264D")]
   public class DataTable : NamedItem, IStringConvertibleMatrix, IDataTable<DataRow> {
     public static new Image StaticItemImage {
@@ -83,5 +83,5 @@
 
     [StorableConstructor]
-    protected DataTable(bool deserializing) : base(deserializing) { }
+    protected DataTable(StorableConstructorFlag _) : base(_) { }
     protected DataTable(DataTable original, Cloner cloner)
       : base(original, cloner) {
Index: stable/HeuristicLab.Analysis/3.3/DataVisualization/DataTableHistory.cs
===================================================================
--- stable/HeuristicLab.Analysis/3.3/DataVisualization/DataTableHistory.cs	(revision 16838)
+++ stable/HeuristicLab.Analysis/3.3/DataVisualization/DataTableHistory.cs	(revision 17097)
@@ -1,5 +1,5 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -24,5 +24,5 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis {
@@ -31,5 +31,5 @@
   /// </summary>
   [Item("DataTableHistory", "Represents history values of data tables.")]
-  [StorableClass]
+  [StorableType("5ECB8C15-4724-4B9A-B667-055CC2FD713A")]
   public class DataTableHistory : ItemCollection<DataTable> {
     public static new Image StaticItemImage {
@@ -38,5 +38,5 @@
 
     [StorableConstructor]
-    protected DataTableHistory(bool deserializing) : base(deserializing) { }
+    protected DataTableHistory(StorableConstructorFlag _) : base(_) { }
     protected DataTableHistory(DataTableHistory original, Cloner cloner) : base(original, cloner) { }
     public DataTableHistory() : base() { }
Index: stable/HeuristicLab.Analysis/3.3/DataVisualization/DataTableValuesCollector.cs
===================================================================
--- stable/HeuristicLab.Analysis/3.3/DataVisualization/DataTableValuesCollector.cs	(revision 16838)
+++ stable/HeuristicLab.Analysis/3.3/DataVisualization/DataTableValuesCollector.cs	(revision 17097)
@@ -1,5 +1,5 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -27,5 +27,5 @@
 using HeuristicLab.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis {
@@ -34,5 +34,5 @@
   /// </summary>
   [Item("DataTableValuesCollector", "An operator which collects the actual values of parameters and adds them to a table of data values.")]
-  [StorableClass]
+  [StorableType("B3409421-D7F0-4C79-B8F8-B7E77E7C554F")]
   public class DataTableValuesCollector : ValuesCollector {
     public ValueLookupParameter<DataTable> DataTableParameter {
@@ -50,5 +50,5 @@
     #region Storing & Cloning
     [StorableConstructor]
-    protected DataTableValuesCollector(bool deserializing) : base(deserializing) { }
+    protected DataTableValuesCollector(StorableConstructorFlag _) : base(_) { }
     protected DataTableValuesCollector(DataTableValuesCollector original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) {
Index: stable/HeuristicLab.Analysis/3.3/DataVisualization/DataTableVisualProperties.cs
===================================================================
--- stable/HeuristicLab.Analysis/3.3/DataVisualization/DataTableVisualProperties.cs	(revision 16838)
+++ stable/HeuristicLab.Analysis/3.3/DataVisualization/DataTableVisualProperties.cs	(revision 17097)
@@ -1,5 +1,5 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -20,9 +20,8 @@
 #endregion
 
-using System;
 using System.ComponentModel;
 using System.Drawing;
 using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis {
@@ -30,8 +29,9 @@
   /// Visual properties of a DataTable.
   /// </summary>
-  [StorableClass]
+  [StorableType("CA654495-8671-499A-B990-0E67E589B906")]
   public class DataTableVisualProperties : DeepCloneable, INotifyPropertyChanged {
 
     #region Histogram Aggregation
+    [StorableType("323A07AD-207C-4D45-B7EC-4E3E48F1E5C6")]
     public enum DataTableHistogramAggregation {
       Overlapping,
@@ -562,5 +562,5 @@
 
     [StorableConstructor]
-    protected DataTableVisualProperties(bool deserializing) : base() { }
+    protected DataTableVisualProperties(StorableConstructorFlag _) { }
     protected DataTableVisualProperties(DataTableVisualProperties original, Cloner cloner)
       : base(original, cloner) {
Index: stable/HeuristicLab.Analysis/3.3/DataVisualization/GanttData.cs
===================================================================
--- stable/HeuristicLab.Analysis/3.3/DataVisualization/GanttData.cs	(revision 16838)
+++ stable/HeuristicLab.Analysis/3.3/DataVisualization/GanttData.cs	(revision 17097)
@@ -2,5 +2,5 @@
 
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -29,9 +29,9 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis {
   [Item("Gantt Data", "Data of a Gantt visualization")]
-  [StorableClass]
+  [StorableType("5EF715EE-23B7-416D-85D0-28C61F81C55D")]
   public class GanttData : NamedItem {
 
@@ -45,5 +45,5 @@
 
     [StorableConstructor]
-    protected GanttData(bool deserializing) : base(deserializing) {}
+    protected GanttData(StorableConstructorFlag _) : base(_) { }
     protected GanttData(GanttData original, Cloner cloner)
       : base(original, cloner) {
@@ -70,5 +70,5 @@
 
   [Item("Gantt Row", "Row of a Gantt chart")]
-  [StorableClass]
+  [StorableType("DDAA9C4C-CE19-4E0D-9AB2-02F8CDF2B8D4")]
   public class GanttRow : NamedItem {
     [Storable]
@@ -77,5 +77,5 @@
 
     [StorableConstructor]
-    protected GanttRow(bool deserializing) : base(deserializing) {}
+    protected GanttRow(StorableConstructorFlag _) : base(_) { }
     protected GanttRow(GanttRow original, Cloner cloner)
       : base(original, cloner) {
@@ -99,5 +99,5 @@
 
   [Item("Gantt Item", "Item of a Gantt chart row")]
-  [StorableClass]
+  [StorableType("E2CEFEAE-AEA4-4F1D-94D5-D7AA784982F5")]
   public class GanttItem : Item, INotifyPropertyChanged {
 
@@ -158,5 +158,5 @@
 
     [StorableConstructor]
-    protected GanttItem(bool deserializing) : base(deserializing) { }
+    protected GanttItem(StorableConstructorFlag _) : base(_) { }
     protected GanttItem(GanttItem original, Cloner cloner)
       : base(original, cloner) {
Index: stable/HeuristicLab.Analysis/3.3/DataVisualization/HeatMap.cs
===================================================================
--- stable/HeuristicLab.Analysis/3.3/DataVisualization/HeatMap.cs	(revision 16838)
+++ stable/HeuristicLab.Analysis/3.3/DataVisualization/HeatMap.cs	(revision 17097)
@@ -1,5 +1,5 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -25,9 +25,9 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis {
   [Item("HeatMap", "Represents a heat map of double values.")]
-  [StorableClass]
+  [StorableType("863005CD-A281-4A42-AF58-6F0BD0988C79")]
   public class HeatMap : DoubleMatrix {
     public static new Image StaticItemImage {
@@ -88,5 +88,5 @@
 
     [StorableConstructor]
-    protected HeatMap(bool deserializing) : base(deserializing) { }
+    protected HeatMap(StorableConstructorFlag _) : base(_) { }
     protected HeatMap(HeatMap original, Cloner cloner)
       : base(original, cloner) {
Index: stable/HeuristicLab.Analysis/3.3/DataVisualization/HeatMapHistory.cs
===================================================================
--- stable/HeuristicLab.Analysis/3.3/DataVisualization/HeatMapHistory.cs	(revision 16838)
+++ stable/HeuristicLab.Analysis/3.3/DataVisualization/HeatMapHistory.cs	(revision 17097)
@@ -1,5 +1,5 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -24,5 +24,5 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis {
@@ -31,5 +31,5 @@
   /// </summary>
   [Item("HeatMapHistory", "Represents history values of heat maps.")]
-  [StorableClass]
+  [StorableType("7E282E3E-673B-4D98-AB51-48DE22E50E43")]
   public class HeatMapHistory : ItemCollection<HeatMap> {
     public static new Image StaticItemImage {
@@ -38,5 +38,5 @@
 
     [StorableConstructor]
-    protected HeatMapHistory(bool deserializing) : base(deserializing) { }
+    protected HeatMapHistory(StorableConstructorFlag _) : base(_) { }
     protected HeatMapHistory(HeatMapHistory original, Cloner cloner) : base(original, cloner) { }
     public HeatMapHistory() : base() { }
Index: stable/HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataRow.cs
===================================================================
--- stable/HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataRow.cs	(revision 16838)
+++ stable/HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataRow.cs	(revision 17097)
@@ -1,5 +1,5 @@
 ﻿#region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -27,9 +27,9 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis {
   [Item("IndexedDataRow", "A data row that contains a series of points.")]
-  [StorableClass]
+  [StorableType("0B0BB900-4C30-4485-82C2-C9E633110685")]
   public class IndexedDataRow<T> : NamedItem, IDataRow {
 
@@ -81,5 +81,5 @@
 
     [StorableConstructor]
-    protected IndexedDataRow(bool deserializing) : base(deserializing) { }
+    protected IndexedDataRow(StorableConstructorFlag _) : base(_) { }
     protected IndexedDataRow(IndexedDataRow<T> original, Cloner cloner)
       : base(original, cloner) {
Index: stable/HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataTable.cs
===================================================================
--- stable/HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataTable.cs	(revision 16838)
+++ stable/HeuristicLab.Analysis/3.3/DataVisualization/IndexedDataTable.cs	(revision 17097)
@@ -1,5 +1,5 @@
 ﻿#region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -29,9 +29,9 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis {
   [Item("IndexedDataTable", "A data table where the points are also given with a certain index.")]
-  [StorableClass]
+  [StorableType("1453C842-6312-4931-9B05-20399A0528D6")]
   public class IndexedDataTable<T> : NamedItem, IStringConvertibleMatrix, IDataTable<IndexedDataRow<T>> {
     public static new Image StaticItemImage {
@@ -75,5 +75,5 @@
 
     [StorableConstructor]
-    protected IndexedDataTable(bool deserializing) : base(deserializing) { }
+    protected IndexedDataTable(StorableConstructorFlag _) : base(_) { }
     protected IndexedDataTable(IndexedDataTable<T> original, Cloner cloner)
       : base(original, cloner) {
Index: stable/HeuristicLab.Analysis/3.3/DataVisualization/Interfaces/IDataRow.cs
===================================================================
--- stable/HeuristicLab.Analysis/3.3/DataVisualization/Interfaces/IDataRow.cs	(revision 16838)
+++ stable/HeuristicLab.Analysis/3.3/DataVisualization/Interfaces/IDataRow.cs	(revision 17097)
@@ -21,6 +21,8 @@
 
 using HeuristicLab.Core;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis {
+  [StorableType("9D660768-24A2-4C74-9434-42FDB3AA3ED2")]
   public interface IDataRow : INamedItem {
     DataRowVisualProperties VisualProperties { get; set; }
Index: stable/HeuristicLab.Analysis/3.3/DataVisualization/Interfaces/IDataTable.cs
===================================================================
--- stable/HeuristicLab.Analysis/3.3/DataVisualization/Interfaces/IDataTable.cs	(revision 16838)
+++ stable/HeuristicLab.Analysis/3.3/DataVisualization/Interfaces/IDataTable.cs	(revision 17097)
@@ -21,6 +21,8 @@
 
 using HeuristicLab.Core;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis {
+  [StorableType("DB6B8542-8A0D-43C1-B5EE-C4D2E8983CDF")]
   public interface IDataTable<TDataRow> : INamedItem where TDataRow : class, IDataRow {
     DataTableVisualProperties VisualProperties { get; set; }
Index: stable/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlot.cs
===================================================================
--- stable/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlot.cs	(revision 16838)
+++ stable/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlot.cs	(revision 17097)
@@ -1,5 +1,5 @@
 ﻿#region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -29,9 +29,9 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis {
   [Item("ScatterPlot", "A scatter plot of 2D data")]
-  [StorableClass]
+  [StorableType("9706C8CB-4118-400B-9AE2-A4F00D7580B5")]
   public class ScatterPlot : NamedItem, IStringConvertibleMatrix {
     public static new Image StaticItemImage {
@@ -80,5 +80,5 @@
 
     [StorableConstructor]
-    protected ScatterPlot(bool deserializing) : base(deserializing) { }
+    protected ScatterPlot(StorableConstructorFlag _) : base(_) { }
     protected ScatterPlot(ScatterPlot original, Cloner cloner)
       : base(original, cloner) {
Index: stable/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotDataRow.cs
===================================================================
--- stable/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotDataRow.cs	(revision 16838)
+++ stable/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotDataRow.cs	(revision 17097)
@@ -1,5 +1,5 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -26,5 +26,5 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis {
@@ -33,5 +33,5 @@
   /// </summary>
   [Item("ScatterPlotDataRow", "A row of data values for a scatter plot.")]
-  [StorableClass]
+  [StorableType("29A84519-5AB7-400F-BDD2-6B497B459B4D")]
   public class ScatterPlotDataRow : NamedItem {
     private ScatterPlotDataRowVisualProperties visualProperties;
@@ -70,5 +70,5 @@
 
     [StorableConstructor]
-    protected ScatterPlotDataRow(bool deserializing) : base(deserializing) { }
+    protected ScatterPlotDataRow(StorableConstructorFlag _) : base(_) { }
     protected ScatterPlotDataRow(ScatterPlotDataRow original, Cloner cloner)
       : base(original, cloner) {
Index: stable/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotDataRowVisualProperties.cs
===================================================================
--- stable/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotDataRowVisualProperties.cs	(revision 16838)
+++ stable/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotDataRowVisualProperties.cs	(revision 17097)
@@ -1,5 +1,5 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -24,5 +24,5 @@
 using System.Drawing;
 using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis {
@@ -30,5 +30,5 @@
   /// Visual properties of a ScatterPlotDataRow.
   /// </summary>
-  [StorableClass]
+  [StorableType("3336A12E-A464-438E-9A37-B87790AE963A")]
   public class ScatterPlotDataRowVisualProperties : DeepCloneable, INotifyPropertyChanged {
     #region PointStyle
@@ -206,5 +206,5 @@
 
     [StorableConstructor]
-    protected ScatterPlotDataRowVisualProperties(bool deserializing) : base() { }
+    protected ScatterPlotDataRowVisualProperties(StorableConstructorFlag _) { }
     protected ScatterPlotDataRowVisualProperties(ScatterPlotDataRowVisualProperties original, Cloner cloner)
       : base(original, cloner) {
Index: stable/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotHistory.cs
===================================================================
--- stable/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotHistory.cs	(revision 16838)
+++ stable/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotHistory.cs	(revision 17097)
@@ -1,5 +1,5 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -24,5 +24,5 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis {
@@ -31,5 +31,5 @@
   /// </summary>
   [Item("ScatterPlotHistory", "Represents history values of scatter plots.")]
-  [StorableClass]
+  [StorableType("2FDE6993-8841-4E1B-BAD0-F0EAF0822C7E")]
   public class ScatterPlotHistory : ItemCollection<ScatterPlot> {
     public static new Image StaticItemImage {
@@ -38,5 +38,5 @@
 
     [StorableConstructor]
-    protected ScatterPlotHistory(bool deserializing) : base(deserializing) { }
+    protected ScatterPlotHistory(StorableConstructorFlag _) : base(_) { }
     protected ScatterPlotHistory(ScatterPlotHistory original, Cloner cloner) : base(original, cloner) { }
     public ScatterPlotHistory() : base() { }
Index: stable/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotVisualProperties.cs
===================================================================
--- stable/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotVisualProperties.cs	(revision 16838)
+++ stable/HeuristicLab.Analysis/3.3/DataVisualization/ScatterPlotVisualProperties.cs	(revision 17097)
@@ -1,5 +1,5 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -23,5 +23,5 @@
 using System.Drawing;
 using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis {
@@ -29,5 +29,5 @@
   /// Visual properties of a ScatterPlot.
   /// </summary>
-  [StorableClass]
+  [StorableType("55E5B5E9-DCA7-4A1B-956D-457BEF0D02D8")]
   public class ScatterPlotVisualProperties : DeepCloneable, INotifyPropertyChanged {
     private Font titleFont;
@@ -310,5 +310,5 @@
 
     [StorableConstructor]
-    protected ScatterPlotVisualProperties(bool deserializing) : base() { }
+    protected ScatterPlotVisualProperties(StorableConstructorFlag _) { }
     protected ScatterPlotVisualProperties(ScatterPlotVisualProperties original, Cloner cloner)
       : base(original, cloner) {
