Index: branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/GQAPBinarySolver.cs
===================================================================
--- branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/GQAPBinarySolver.cs	(revision 15890)
+++ branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/GQAPBinarySolver.cs	(revision 16728)
@@ -22,4 +22,5 @@
 using System;
 using System.Threading;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -27,10 +28,9 @@
 using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Optimization;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using localsolver;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LocalSolverNet {
   [Item("LocalSolver Binary (GQAP)", "LocalSolver algorithm solving the GQAP using 0-1 decision variables")]
-  [StorableClass]
+  [StorableType("E9040268-4240-4EF7-8E9A-6991D0831D06")]
   [Creatable(CreatableAttribute.Categories.Algorithms)]
   public sealed class GQAPBinarySolver : ContextAlgorithm<LocalSolverContext, IntegerVectorEncoding> {
@@ -56,5 +56,5 @@
 
     [StorableConstructor]
-    private GQAPBinarySolver(bool deserializing) : base(deserializing) { }
+    private GQAPBinarySolver(StorableConstructorFlag _) : base(_) { }
     private GQAPBinarySolver(GQAPBinarySolver original, Cloner cloner)
     : base(original, cloner) {
Index: branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/GQAPIntegerSolver.cs
===================================================================
--- branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/GQAPIntegerSolver.cs	(revision 15890)
+++ branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/GQAPIntegerSolver.cs	(revision 16728)
@@ -22,4 +22,5 @@
 using System;
 using System.Threading;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -27,10 +28,9 @@
 using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Optimization;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using localsolver;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LocalSolverNet {
   [Item("LocalSolver Integer (GQAP)", "LocalSolver algorithm solving the GQAP using integer decision variables")]
-  [StorableClass]
+  [StorableType("6D0D77CE-A8DE-41EA-9674-A1D59782D03B")]
   [Creatable(CreatableAttribute.Categories.Algorithms)]
   public sealed class GQAPIntegerSolver : ContextAlgorithm<LocalSolverContext, IntegerVectorEncoding> {
@@ -55,5 +55,5 @@
 
     [StorableConstructor]
-    private GQAPIntegerSolver(bool deserializing) : base(deserializing) { }
+    private GQAPIntegerSolver(StorableConstructorFlag _) : base(_) { }
     private GQAPIntegerSolver(GQAPIntegerSolver original, Cloner cloner)
     : base(original, cloner) {
Index: branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/GQAPListSolver.cs
===================================================================
--- branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/GQAPListSolver.cs	(revision 15890)
+++ branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/GQAPListSolver.cs	(revision 16728)
@@ -22,4 +22,5 @@
 using System;
 using System.Threading;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -27,10 +28,9 @@
 using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Optimization;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using localsolver;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LocalSolverNet {
   [Item("LocalSolver List (GQAP)", "LocalSolver algorithm solving the GQAP using list decision variables")]
-  [StorableClass]
+  [StorableType("BBB27FAA-DCFD-4DB4-A465-4A02E1A0EDA9")]
   [Creatable(CreatableAttribute.Categories.Algorithms)]
   public sealed class GQAPListSolver : ContextAlgorithm<LocalSolverContext, IntegerVectorEncoding> {
@@ -55,5 +55,5 @@
 
     [StorableConstructor]
-    private GQAPListSolver(bool deserializing) : base(deserializing) { }
+    private GQAPListSolver(StorableConstructorFlag _) : base(_) { }
     private GQAPListSolver(GQAPListSolver original, Cloner cloner)
     : base(original, cloner) {
Index: branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/LocalSolverContext.cs
===================================================================
--- branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/LocalSolverContext.cs	(revision 15890)
+++ branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/LocalSolverContext.cs	(revision 16728)
@@ -20,12 +20,12 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LocalSolverNet {
   [Item("LocalSolver Context", "A context for CPLEX solvers.")]
-  [StorableClass]
+  [StorableType("DAE4D0C7-AFE1-4FCF-9DD5-899E4DC4FD9E")]
   public class LocalSolverContext : SingleSolutionContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
 
@@ -45,5 +45,5 @@
 
     [StorableConstructor]
-    protected LocalSolverContext(bool deserializing) : base(deserializing) { }
+    protected LocalSolverContext(StorableConstructorFlag _) : base(_) { }
     protected LocalSolverContext(LocalSolverContext original, Cloner cloner)
       : base(original, cloner) {
