diff --git a/examples/common/passive/FairPassiveContFact.h b/examples/common/passive/FairPassiveContFact.h
index 19d76bac1a..f4196c5c1c 100644
--- a/examples/common/passive/FairPassiveContFact.h
+++ b/examples/common/passive/FairPassiveContFact.h
@@ -18,10 +18,10 @@ class FairPassiveContFact : public FairContFact
 {
   public:
     FairPassiveContFact();
-    ~FairPassiveContFact() {}
-    FairParSet* createContainer(FairContainer*);
+    ~FairPassiveContFact() override = default;
+    FairParSet* createContainer(FairContainer*) override;
 
-    ClassDef(FairPassiveContFact, 0);   // Factory for all Passive parameter containers
+    ClassDefOverride(FairPassiveContFact, 0);   // Factory for all Passive parameter containers
 };
 
 #endif /* !FAIRPASSIVECONTFACT_H */
diff --git a/examples/simulation/Tutorial1/src/FairTutorialDet1ContFact.h b/examples/simulation/Tutorial1/src/FairTutorialDet1ContFact.h
index 71e11916e2..4ee2896270 100644
--- a/examples/simulation/Tutorial1/src/FairTutorialDet1ContFact.h
+++ b/examples/simulation/Tutorial1/src/FairTutorialDet1ContFact.h
@@ -18,9 +18,9 @@ class FairTutorialDet1ContFact : public FairContFact
 {
   public:
     FairTutorialDet1ContFact();
-    ~FairTutorialDet1ContFact() {}
-    FairParSet* createContainer(FairContainer*);
-    ClassDef(FairTutorialDet1ContFact, 0);   // Factory for all MyDet parameter containers
+    ~FairTutorialDet1ContFact() override = default;
+    FairParSet* createContainer(FairContainer*) override;
+    ClassDefOverride(FairTutorialDet1ContFact, 0);   // Factory for all MyDet parameter containers
 };
 
 #endif /* !FAIRTUTORIALDETCONTFACT_H */
diff --git a/examples/simulation/Tutorial2/src/FairTutorialDet2ContFact.h b/examples/simulation/Tutorial2/src/FairTutorialDet2ContFact.h
index e6f8181b37..de8045d911 100644
--- a/examples/simulation/Tutorial2/src/FairTutorialDet2ContFact.h
+++ b/examples/simulation/Tutorial2/src/FairTutorialDet2ContFact.h
@@ -18,9 +18,9 @@ class FairTutorialDet2ContFact : public FairContFact
 {
   public:
     FairTutorialDet2ContFact();
-    ~FairTutorialDet2ContFact() {}
-    FairParSet* createContainer(FairContainer*);
-    ClassDef(FairTutorialDet2ContFact, 0);   // Factory for all MyDet parameter containers
+    ~FairTutorialDet2ContFact() override = default;
+    FairParSet* createContainer(FairContainer*) override;
+    ClassDefOverride(FairTutorialDet2ContFact, 0);   // Factory for all MyDet parameter containers
 };
 
 #endif /* !FAIRTUTORIALDETCONTFACT_H */
diff --git a/examples/simulation/Tutorial4/src/param/FairTutorialDet4ContFact.h b/examples/simulation/Tutorial4/src/param/FairTutorialDet4ContFact.h
index 205a71cb63..de0feab0e2 100644
--- a/examples/simulation/Tutorial4/src/param/FairTutorialDet4ContFact.h
+++ b/examples/simulation/Tutorial4/src/param/FairTutorialDet4ContFact.h
@@ -18,9 +18,9 @@ class FairTutorialDet4ContFact : public FairContFact
 {
   public:
     FairTutorialDet4ContFact();
-    ~FairTutorialDet4ContFact() {}
-    FairParSet* createContainer(FairContainer*);
-    ClassDef(FairTutorialDet4ContFact, 0);   // Factory for all MyDet parameter containers
+    ~FairTutorialDet4ContFact() override = default;
+    FairParSet* createContainer(FairContainer*) override;
+    ClassDefOverride(FairTutorialDet4ContFact, 0);   // Factory for all MyDet parameter containers
 };
 
 #endif /* !FAIRTUTORIALDETCONTFACT_H */
diff --git a/examples/simulation/rutherford/src/FairRutherfordContFact.h b/examples/simulation/rutherford/src/FairRutherfordContFact.h
index fc884bb462..9a91b7a7d3 100644
--- a/examples/simulation/rutherford/src/FairRutherfordContFact.h
+++ b/examples/simulation/rutherford/src/FairRutherfordContFact.h
@@ -18,7 +18,7 @@ class FairRutherfordContFact : public FairContFact
 {
   public:
     FairRutherfordContFact();
-    ~FairRutherfordContFact() override {}
+    ~FairRutherfordContFact() override = default;
     FairParSet* createContainer(FairContainer*) override;
     ClassDefOverride(FairRutherfordContFact, 0);   // Factory for all FairRutherford parameter containers
 };
diff --git a/templates/NewDetector_root_containers/NewDetectorContFact.h b/templates/NewDetector_root_containers/NewDetectorContFact.h
index 2332115ce7..2155a414de 100644
--- a/templates/NewDetector_root_containers/NewDetectorContFact.h
+++ b/templates/NewDetector_root_containers/NewDetectorContFact.h
@@ -16,9 +16,9 @@ class NewDetectorContFact : public FairContFact
 {
   public:
     NewDetectorContFact();
-    ~NewDetectorContFact() {}
-    FairParSet* createContainer(FairContainer*);
-    ClassDef(NewDetectorContFact, 0);   // Factory for all NewDetector parameter containers
+    ~NewDetectorContFact() override = default;
+    FairParSet* createContainer(FairContainer*) override;
+    ClassDefOverride(NewDetectorContFact, 0);   // Factory for all NewDetector parameter containers
 };
 
 #endif
diff --git a/templates/NewDetector_stl_containers/NewDetectorContFact.h b/templates/NewDetector_stl_containers/NewDetectorContFact.h
index 2332115ce7..2155a414de 100644
--- a/templates/NewDetector_stl_containers/NewDetectorContFact.h
+++ b/templates/NewDetector_stl_containers/NewDetectorContFact.h
@@ -16,9 +16,9 @@ class NewDetectorContFact : public FairContFact
 {
   public:
     NewDetectorContFact();
-    ~NewDetectorContFact() {}
-    FairParSet* createContainer(FairContainer*);
-    ClassDef(NewDetectorContFact, 0);   // Factory for all NewDetector parameter containers
+    ~NewDetectorContFact() override = default;
+    FairParSet* createContainer(FairContainer*) override;
+    ClassDefOverride(NewDetectorContFact, 0);   // Factory for all NewDetector parameter containers
 };
 
 #endif
diff --git a/templates/project_root_containers/NewDetector/NewDetectorContFact.h b/templates/project_root_containers/NewDetector/NewDetectorContFact.h
index 2332115ce7..2155a414de 100644
--- a/templates/project_root_containers/NewDetector/NewDetectorContFact.h
+++ b/templates/project_root_containers/NewDetector/NewDetectorContFact.h
@@ -16,9 +16,9 @@ class NewDetectorContFact : public FairContFact
 {
   public:
     NewDetectorContFact();
-    ~NewDetectorContFact() {}
-    FairParSet* createContainer(FairContainer*);
-    ClassDef(NewDetectorContFact, 0);   // Factory for all NewDetector parameter containers
+    ~NewDetectorContFact() override = default;
+    FairParSet* createContainer(FairContainer*) override;
+    ClassDefOverride(NewDetectorContFact, 0);   // Factory for all NewDetector parameter containers
 };
 
 #endif
diff --git a/templates/project_root_containers/passive/MyPassiveContFact.h b/templates/project_root_containers/passive/MyPassiveContFact.h
index 8830057460..734dd018f9 100644
--- a/templates/project_root_containers/passive/MyPassiveContFact.h
+++ b/templates/project_root_containers/passive/MyPassiveContFact.h
@@ -24,9 +24,9 @@ class MyPassiveContFact : public FairContFact
 {
   public:
     MyPassiveContFact();
-    ~MyPassiveContFact() {}
-    FairParSet* createContainer(FairContainer*);
-    ClassDef(MyPassiveContFact, 0);   // Factory for all Passive parameter containers
+    ~MyPassiveContFact() override = default;
+    FairParSet* createContainer(FairContainer*) override;
+    ClassDefOverride(MyPassiveContFact, 0);   // Factory for all Passive parameter containers
 };
 
 #endif /* !My_PASSIVECONTFACT_H */
diff --git a/templates/project_stl_containers/NewDetector/NewDetectorContFact.h b/templates/project_stl_containers/NewDetector/NewDetectorContFact.h
index 2332115ce7..2155a414de 100644
--- a/templates/project_stl_containers/NewDetector/NewDetectorContFact.h
+++ b/templates/project_stl_containers/NewDetector/NewDetectorContFact.h
@@ -16,9 +16,9 @@ class NewDetectorContFact : public FairContFact
 {
   public:
     NewDetectorContFact();
-    ~NewDetectorContFact() {}
-    FairParSet* createContainer(FairContainer*);
-    ClassDef(NewDetectorContFact, 0);   // Factory for all NewDetector parameter containers
+    ~NewDetectorContFact() override = default;
+    FairParSet* createContainer(FairContainer*) override;
+    ClassDefOverride(NewDetectorContFact, 0);   // Factory for all NewDetector parameter containers
 };
 
 #endif
diff --git a/templates/project_stl_containers/passive/MyPassiveContFact.h b/templates/project_stl_containers/passive/MyPassiveContFact.h
index 8830057460..734dd018f9 100644
--- a/templates/project_stl_containers/passive/MyPassiveContFact.h
+++ b/templates/project_stl_containers/passive/MyPassiveContFact.h
@@ -24,9 +24,9 @@ class MyPassiveContFact : public FairContFact
 {
   public:
     MyPassiveContFact();
-    ~MyPassiveContFact() {}
-    FairParSet* createContainer(FairContainer*);
-    ClassDef(MyPassiveContFact, 0);   // Factory for all Passive parameter containers
+    ~MyPassiveContFact() override = default;
+    FairParSet* createContainer(FairContainer*) override;
+    ClassDefOverride(MyPassiveContFact, 0);   // Factory for all Passive parameter containers
 };
 
 #endif /* !My_PASSIVECONTFACT_H */