Index: addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/EvolvabilityAnalyzer.cs
===================================================================
--- addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/EvolvabilityAnalyzer.cs	(revision 15691)
+++ addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/EvolvabilityAnalyzer.cs	(revision 16573)
@@ -10,9 +10,10 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis.FitnessLandscape.Algorithms {
 
   [Item("EvolvabilityAnalyzer", "Analyzes and consolidates repeated (very short) trails to evolvability metrics.")]
-  [StorableClass]
+  [StorableType("446A5494-B5EE-4C52-B6AE-B1B37E3E5E4D")]
   public class EvolvabilityAnalyzer : SingleSuccessorOperator, IRepeatsAnalyzer {
 
@@ -49,5 +50,5 @@
     #region Construction & Cloning
     [StorableConstructor]
-    protected EvolvabilityAnalyzer(bool deserializing) : base(deserializing) { }
+    protected EvolvabilityAnalyzer(StorableConstructorFlag _) : base(_) { }
     protected EvolvabilityAnalyzer(EvolvabilityAnalyzer original, Cloner cloner) : base(original, cloner) { }
     public EvolvabilityAnalyzer() {
Index: addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/LocalAnalysis.cs
===================================================================
--- addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/LocalAnalysis.cs	(revision 15691)
+++ addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/LocalAnalysis.cs	(revision 16573)
@@ -31,9 +31,10 @@
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Random;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
   [Item("Local Analysis", "A local analysis algorithm.")]
   [Creatable("Algorithms")]
-  [StorableClass]
+  [StorableType("533E9F86-9195-4C03-972A-B8C49E1C15BD")]
   public sealed class LocalAnalysis : HeuristicOptimizationEngineAlgorithm, IStorableContent {
     public string Filename { get; set; }
@@ -90,5 +91,5 @@
 
     [StorableConstructor]
-    private LocalAnalysis(bool deserializing) : base(deserializing) { }
+    private LocalAnalysis(StorableConstructorFlag _) : base(_) { }
     private LocalAnalysis(LocalAnalysis original, Cloner cloner)
       : base(original, cloner) {
Index: addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/LocalAnalysisMainLoop.cs
===================================================================
--- addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/LocalAnalysisMainLoop.cs	(revision 15691)
+++ addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/LocalAnalysisMainLoop.cs	(revision 16573)
@@ -29,4 +29,5 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Selection;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
@@ -35,5 +36,5 @@
   /// </summary>
   [Item("LocalAnalysisMainLoop", "An operator which represents the main loop of a best improvement local search (if only a single move is generated in each iteration it is a first improvement local search).")]
-  [StorableClass]
+  [StorableType("D1B3518C-6A0A-4123-893E-0D4C89DA056C")]
   public class LocalAnalysisMainLoop : AlgorithmOperator {
 
@@ -72,5 +73,5 @@
 
     [StorableConstructor]
-    protected LocalAnalysisMainLoop(bool deserializing) : base(deserializing) { }
+    protected LocalAnalysisMainLoop(StorableConstructorFlag _) : base(_) { }
     protected LocalAnalysisMainLoop(LocalAnalysisMainLoop original, Cloner cloner) : base(original, cloner) { }
     public LocalAnalysisMainLoop()
Index: addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/RepeatMultiAnalyzer.cs
===================================================================
--- addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/RepeatMultiAnalyzer.cs	(revision 15691)
+++ addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/RepeatMultiAnalyzer.cs	(revision 16573)
@@ -28,8 +28,10 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
+using HEAL.Attic;
+
 namespace HeuristicLab.Analysis.FitnessLandscape {
 
   [Item("RepeatMultiAnalyzer", "A collection of analyzers for consolidating repeats.")]
-  [StorableClass]
+  [StorableType("D65FCC67-534C-4C05-85DE-1D837D0D8F11")]
   public class RepeatMultiAnalyzer : CheckedMultiOperator<IRepeatsAnalyzer>, IAnalyzer {
     public bool EnabledByDefault {
@@ -42,5 +44,5 @@
 
     [StorableConstructor]
-    protected RepeatMultiAnalyzer(bool deserializing) : base(deserializing) { }
+    protected RepeatMultiAnalyzer(StorableConstructorFlag _) : base(_) { }
     protected RepeatMultiAnalyzer(RepeatMultiAnalyzer original, Cloner cloner) : base(original, cloner) { }
 
Index: addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/RepeatedInformationAnalyzer.cs
===================================================================
--- addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/RepeatedInformationAnalyzer.cs	(revision 15691)
+++ addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/RepeatedInformationAnalyzer.cs	(revision 16573)
@@ -10,9 +10,10 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis.FitnessLandscape.Algorithms {
 
   [Item("RepeatedInformationAnalyzer", "Analyzes and consolidates repeated information analyses.")]
-  [StorableClass]
+  [StorableType("A53A3F9B-BC38-47E9-B435-42DEA10A4ABC")]
   public class RepeatedInformationAnalyzer : SingleSuccessorOperator, IRepeatsAnalyzer {
 
@@ -44,5 +45,5 @@
     #region Construction & Cloning
     [StorableConstructor]
-    protected RepeatedInformationAnalyzer(bool deserializing) : base(deserializing) { }
+    protected RepeatedInformationAnalyzer(StorableConstructorFlag _) : base(_) { }
     protected RepeatedInformationAnalyzer(RepeatedInformationAnalyzer original, Cloner cloner) : base(original, cloner) { }
     public RepeatedInformationAnalyzer() {
Index: addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/RepeatedLocalAnalysis.cs
===================================================================
--- addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/RepeatedLocalAnalysis.cs	(revision 15691)
+++ addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/RepeatedLocalAnalysis.cs	(revision 16573)
@@ -33,9 +33,10 @@
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Random;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
   [Item("Repeated Local Analysis", "A local analysis algorithm restarted several times.")]
   [Creatable("Algorithms")]
-  [StorableClass]
+  [StorableType("F70D7A4D-821A-4D2F-9A15-C18628D2060F")]
   public sealed class RepeatedLocalAnalysis : HeuristicOptimizationEngineAlgorithm, IStorableContent {
     public string Filename { get; set; }
@@ -107,5 +108,5 @@
 
     [StorableConstructor]
-    private RepeatedLocalAnalysis(bool deserializing) : base(deserializing) { }
+    private RepeatedLocalAnalysis(StorableConstructorFlag _) : base(_) { }
     private RepeatedLocalAnalysis(RepeatedLocalAnalysis original, Cloner cloner)
       : base(original, cloner) {
Index: addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/RepeatedRuggednessAnalyzer.cs
===================================================================
--- addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/RepeatedRuggednessAnalyzer.cs	(revision 15691)
+++ addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/RepeatedRuggednessAnalyzer.cs	(revision 16573)
@@ -9,4 +9,5 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis.FitnessLandscape.Algorithms {
@@ -14,5 +15,5 @@
 
   [Item("RepeatedRuggednessAnalyzer", "Analyzes and consolidates repeated ruggedness analyses.")]
-  [StorableClass]
+  [StorableType("CB5A6876-CC84-4D00-9E1C-65A537A3EC92")]
   public class RepeatedRuggednessAnalyzer : SingleSuccessorOperator, IRepeatsAnalyzer {
 
@@ -61,5 +62,5 @@
     #region Construction & Cloning
     [StorableConstructor]
-    protected RepeatedRuggednessAnalyzer(bool deserializing) : base(deserializing) { }
+    protected RepeatedRuggednessAnalyzer(StorableConstructorFlag _) : base(_) { }
     protected RepeatedRuggednessAnalyzer(RepeatedRuggednessAnalyzer original, Cloner cloner) : base(original, cloner) { }
     public RepeatedRuggednessAnalyzer() {
Index: addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/RepeatedUpDownWalkAnalyzer.cs
===================================================================
--- addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/RepeatedUpDownWalkAnalyzer.cs	(revision 15691)
+++ addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/RepeatedUpDownWalkAnalyzer.cs	(revision 16573)
@@ -9,9 +9,10 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis.FitnessLandscape.Algorithms {
 
   [Item("RepeatedUpDownWalkAnalyzer", "Analyzes and consolidates repeated up down walk analyses.")]
-  [StorableClass]
+  [StorableType("1B832D9F-7D75-41AB-94D1-D638F4067CC0")]
   public class RepeatedUpDownWalkAnalyzer : SingleSuccessorOperator, IRepeatsAnalyzer {
 
@@ -48,5 +49,5 @@
     #region Construction & Cloning
     [StorableConstructor]
-    protected RepeatedUpDownWalkAnalyzer(bool deserializing) : base(deserializing) { }
+    protected RepeatedUpDownWalkAnalyzer(StorableConstructorFlag _) : base(_) { }
     protected RepeatedUpDownWalkAnalyzer(RepeatedUpDownWalkAnalyzer original, Cloner cloner) : base(original, cloner) { }
     public RepeatedUpDownWalkAnalyzer() {
Index: addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/ScopeDuplicator.cs
===================================================================
--- addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/ScopeDuplicator.cs	(revision 15691)
+++ addons/HeuristicLab.FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Algorithms/ScopeDuplicator.cs	(revision 16573)
@@ -6,9 +6,10 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Optimization;
+using HEAL.Attic;
 
 namespace HeuristicLab.Analysis.FitnessLandscape.Algorithms {
 
   [Item("ScopeDuplicator", "Places clones of the first sub-scope as sub-scopes into n newly created scopes.")]
-  [StorableClass]
+  [StorableType("99032F61-ACCD-4312-8602-71C7D8787391")]
   public class ScopeDuplicator : SingleSuccessorOperator {
 
@@ -27,5 +28,5 @@
     #region Construction & Cloning
     [StorableConstructor]
-    protected ScopeDuplicator(bool deserializing) : base(deserializing) { }
+    protected ScopeDuplicator(StorableConstructorFlag _) : base(_) { }
     protected ScopeDuplicator(ScopeDuplicator original, Cloner cloner) : base(original, cloner) { }
     public ScopeDuplicator()
