Index: branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC/LAHC.cs
===================================================================
--- branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC/LAHC.cs	(revision 15700)
+++ branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC/LAHC.cs	(revision 16728)
@@ -23,4 +23,5 @@
 using System.Linq;
 using System.Threading;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -29,10 +30,9 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LAHC {
   [Item("LAHC (GQAP)", "Late-acceptance hill climber for the GQAP.")]
   [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms)]
-  [StorableClass]
+  [StorableType("41FABEE1-506A-45FE-A6D3-57932036AEC8")]
   public sealed class LAHC : StochasticAlgorithm<LAHCContext, IntegerVectorEncoding> {
 
@@ -62,5 +62,5 @@
 
     [StorableConstructor]
-    private LAHC(bool deserializing) : base(deserializing) { }
+    private LAHC(StorableConstructorFlag _) : base(_) { }
     private LAHC(LAHC original, Cloner cloner)
       : base(original, cloner) {
Index: branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC/LAHCContext.cs
===================================================================
--- branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC/LAHCContext.cs	(revision 15700)
+++ branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC/LAHCContext.cs	(revision 16728)
@@ -20,13 +20,13 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LAHC {
   [Item("LAHC Context", "Context for late-acceptance hill climber")]
-  [StorableClass]
+  [StorableType("546B6C06-D986-49AA-BDEB-B664D2A9DA8C")]
   public sealed class LAHCContext : SingleSolutionContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
     [Storable]
@@ -59,5 +59,5 @@
     
     [StorableConstructor]
-    private LAHCContext(bool deserializing) : base(deserializing) { }
+    private LAHCContext(StorableConstructorFlag _) : base(_) { }
     private LAHCContext(LAHCContext original, Cloner cloner)
     : base(original, cloner) {
Index: branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC/pLAHC.cs
===================================================================
--- branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC/pLAHC.cs	(revision 15700)
+++ branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC/pLAHC.cs	(revision 16728)
@@ -22,4 +22,5 @@
 using System;
 using System.Threading;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -28,10 +29,9 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LAHC {
   [Item("pLAHC-s (GQAP)", "Parameterless Late-acceptance hill climber for the GQAP.")]
   [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms)]
-  [StorableClass]
+  [StorableType("90A97927-D784-4F73-9215-ADC75A9F6C9D")]
   public sealed class PLAHCS : StochasticAlgorithm<PLAHCContext, IntegerVectorEncoding> {
 
@@ -72,5 +72,5 @@
 
     [StorableConstructor]
-    private PLAHCS(bool deserializing) : base(deserializing) { }
+    private PLAHCS(StorableConstructorFlag _) : base(_) { }
     private PLAHCS(PLAHCS original, Cloner cloner)
       : base(original, cloner) {
Index: branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC/pLAHCContext.cs
===================================================================
--- branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC/pLAHCContext.cs	(revision 15700)
+++ branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC/pLAHCContext.cs	(revision 16728)
@@ -20,13 +20,13 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LAHC {
   [Item("pLAHC-s Context", "Context for parameterless late-acceptance hill climber with seeding.")]
-  [StorableClass]
+  [StorableType("3C550AB5-8FEC-42DA-9200-ABC98A1C20EA")]
   public sealed class PLAHCContext : SingleSolutionContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
     [Storable]
@@ -73,5 +73,5 @@
     
     [StorableConstructor]
-    private PLAHCContext(bool deserializing) : base(deserializing) { }
+    private PLAHCContext(StorableConstructorFlag _) : base(_) { }
     private PLAHCContext(PLAHCContext original, Cloner cloner)
     : base(original, cloner) {
