diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index e0bc66f26d6913bb3a7584cda4f14434dfbfca09..2249afc82c8e87cc679fcffd891d83310bcdc07c 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -6,6 +6,35 @@
 
 ### Bug fixes
 
+# v4.0-5
+
+## Summary
+
+### Features
+- [frontend] Add options to "tapepool ls" to filter tapepools on their name, vo and encryption
+- cta/CTA#898 cta-send-event now gets the requester id and eos instance as command line arguments
+- cta/CTA#1005 "tape ls" now can filter tapes on wether they were imported from CASTOR
+- cta/CTA#1006 "repack ls" now shows the tapepool of the tape being repacked
+
+### Bug fixes
+
+- [frontend] Adds missing break after "schedulinginfo ls" command
+- cta/CTA#999 Adds a default mount rule
+- cta/CTA#1003 The expansion of a repack request now fails if the archive route for archiving the repacked files is missing
+
+# v4.0-4
+
+### Bug fixes
+
+- cta/CTA#1002 Do not requeue report jobs when reportType is NoReportRequired
+
+# v4.0-3
+
+### Features
+
+- Upgraded ceph to version 14.2.20
+- Adds cta-verify-file to cta-cli RPM
+
 # v4.0-2
 
 ## Summary
diff --git a/catalogue/AllCatalogueSchema.hpp b/catalogue/AllCatalogueSchema.hpp
index ec371023f5ee83ca63546de133685a9d495be85b..4c56470c0808e81c276cee9cd6c92ed2c666e900 100644
--- a/catalogue/AllCatalogueSchema.hpp
+++ b/catalogue/AllCatalogueSchema.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/AllCatalogueSchema.hpp.in b/catalogue/AllCatalogueSchema.hpp.in
index a1c0b7c1ad81f344af0d1b40385ca6978a65214b..6288657122adfb6dc773b930e2cc5a946c6a956a 100644
--- a/catalogue/AllCatalogueSchema.hpp.in
+++ b/catalogue/AllCatalogueSchema.hpp.in
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/ArchiveFileBuilder.cpp b/catalogue/ArchiveFileBuilder.cpp
index fdc6dbefc0b608f0c595860ab6ef00fa54c649ff..2863a860731b5136f790e59deba92446d3f68b0c 100644
--- a/catalogue/ArchiveFileBuilder.cpp
+++ b/catalogue/ArchiveFileBuilder.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/ArchiveFileBuilder.hpp b/catalogue/ArchiveFileBuilder.hpp
index 81a5682a0324a6a96fd9f1c5f38dc57864a26ec5..ea622728505d12c5f9efc034d6852622e89a62de 100644
--- a/catalogue/ArchiveFileBuilder.hpp
+++ b/catalogue/ArchiveFileBuilder.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/ArchiveFileRow.cpp b/catalogue/ArchiveFileRow.cpp
index b9c4223fc3b24d8bcc0c5466ab73a9df5ae68693..52dd38dd4762008ac40a4b3f9b7a026c982b3f7e 100644
--- a/catalogue/ArchiveFileRow.cpp
+++ b/catalogue/ArchiveFileRow.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/ArchiveFileRow.hpp b/catalogue/ArchiveFileRow.hpp
index 674e7aa6940bbd2988ead74515bd86a6b3ed5ba7..7b6c391c7e95d4e14fb6d30f6a12a3049b60a92d 100644
--- a/catalogue/ArchiveFileRow.hpp
+++ b/catalogue/ArchiveFileRow.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/ArchiveFileRowWithoutTimestamps.cpp b/catalogue/ArchiveFileRowWithoutTimestamps.cpp
index ed83c198f564cc6719517d3abfb14dc075a32509..adb11f7fb524a99989f507cd4a7c1841683c9967 100644
--- a/catalogue/ArchiveFileRowWithoutTimestamps.cpp
+++ b/catalogue/ArchiveFileRowWithoutTimestamps.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/ArchiveFileRowWithoutTimestamps.hpp b/catalogue/ArchiveFileRowWithoutTimestamps.hpp
index 94c7d845c049e8f0363886b86c621e5e35157d86..8b64e0b47c6ac53dacedd9ff56c17229ad755706 100644
--- a/catalogue/ArchiveFileRowWithoutTimestamps.hpp
+++ b/catalogue/ArchiveFileRowWithoutTimestamps.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/Catalogue.cpp b/catalogue/Catalogue.cpp
index e0f4f2bd21e4d90906e6839e0f380fbc0f4c9272..e8e43bbd48802299b8f9409e03e475f2bea5939f 100644
--- a/catalogue/Catalogue.cpp
+++ b/catalogue/Catalogue.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/Catalogue.hpp b/catalogue/Catalogue.hpp
index e8caf2a02f39d301b04de9a9401191e15fb9d193..4a5893cbb66f2af5139e07faada5080015070d2d 100644
--- a/catalogue/Catalogue.hpp
+++ b/catalogue/Catalogue.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -65,12 +65,14 @@
 #include "common/exception/FileSizeMismatch.hpp"
 #include "common/exception/TapeFseqMismatch.hpp"
 #include "common/exception/UserError.hpp"
+#include "common/exception/UserErrorWithCacheInfo.hpp"
 #include "common/log/LogContext.hpp"
 #include "common/log/Logger.hpp"
 #include "common/optional.hpp"
 #include "disk/DiskSystem.hpp"
 #include "RecyleTapeFileSearchCriteria.hpp"
 #include "CreateMountPolicyAttributes.hpp"
+#include "TapePoolSearchCriteria.hpp"
 
 #include <list>
 #include <map>
@@ -93,6 +95,7 @@ CTA_GENERATE_USER_EXCEPTION_CLASS(UserSpecifiedANonExistentArchiveRoute);
 CTA_GENERATE_USER_EXCEPTION_CLASS(UserSpecifiedANonExistentLogicalLibrary);
 CTA_GENERATE_USER_EXCEPTION_CLASS(UserSpecifiedANonExistentTape);
 CTA_GENERATE_USER_EXCEPTION_CLASS(UserSpecifiedANonExistentTapePool);
+CTA_GENERATE_USER_EXCEPTION_CLASS(UserSpecifiedANonExistentVirtualOrganization);
 CTA_GENERATE_USER_EXCEPTION_CLASS(UserSpecifiedAnEmptyStringComment);
 CTA_GENERATE_USER_EXCEPTION_CLASS(UserSpecifiedAnEmptyStringDiskSystemName);
 CTA_GENERATE_USER_EXCEPTION_CLASS(UserSpecifiedAnEmptyStringFileRegexp);
@@ -163,6 +166,7 @@ public:
    * used by the Catalogue to determine the mount policy to be used when
    * archiving the file.
    * @return The new archive file identifier.
+   * @throw UserErrorWithCacheInfo if there was a user error.
    */
   virtual uint64_t checkAndGetNextArchiveFileId(
     const std::string &diskInstanceName,
@@ -489,7 +493,7 @@ public:
   */
   virtual void deleteTapePool(const std::string &name) = 0;
 
-  virtual std::list<TapePool> getTapePools() const = 0;
+  virtual std::list<TapePool> getTapePools(const TapePoolSearchCriteria &searchCriteria = TapePoolSearchCriteria()) const = 0;
 
   /**
    * @return The tape pool with the specified name.
diff --git a/catalogue/CatalogueFactory.cpp b/catalogue/CatalogueFactory.cpp
index 013c4026afc12c6985429f170a9ea65927de00de..958a11c065f3a637007ce9066c5ff89954c75870 100644
--- a/catalogue/CatalogueFactory.cpp
+++ b/catalogue/CatalogueFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/CatalogueFactory.hpp b/catalogue/CatalogueFactory.hpp
index 544487324d64b1ca109502adc36f9a050edd5263..c635d61ab85a648677be2011da9c42b1d36b1d24 100644
--- a/catalogue/CatalogueFactory.hpp
+++ b/catalogue/CatalogueFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/CatalogueFactoryFactory.cpp b/catalogue/CatalogueFactoryFactory.cpp
index 59bc6bbbe2b863ae7d51de9119a6953ef9dfa97e..f7229d3df1e5cdfa836443b269efa65e2013a167 100644
--- a/catalogue/CatalogueFactoryFactory.cpp
+++ b/catalogue/CatalogueFactoryFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/CatalogueFactoryFactory.hpp b/catalogue/CatalogueFactoryFactory.hpp
index 1dba32ef7fe7c034f77b4b696a506c1647a03f9d..9f53db68d8743a96fc35d13e03beb727c22777fd 100644
--- a/catalogue/CatalogueFactoryFactory.hpp
+++ b/catalogue/CatalogueFactoryFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/CatalogueItor.hpp b/catalogue/CatalogueItor.hpp
index a57bcdb3dae1466d1869a95991ebd99afbb86e56..80bf81e9b456d4557d6ca42aa65d5ce401aeff93 100644
--- a/catalogue/CatalogueItor.hpp
+++ b/catalogue/CatalogueItor.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/CatalogueItorImpl.hpp b/catalogue/CatalogueItorImpl.hpp
index 74b51da783e1b22e5063317e0b9eb004db0d7aaf..8901eb8433f4f28dc8fad65b15f5de3716435a35 100644
--- a/catalogue/CatalogueItorImpl.hpp
+++ b/catalogue/CatalogueItorImpl.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/CatalogueRetryWrapper.hpp b/catalogue/CatalogueRetryWrapper.hpp
index 7a4b2ad399a9b791a4b1a10c6c0063e7d3a5c2fd..b0e0a67792b205325c7f8be6021e3855c175a30e 100644
--- a/catalogue/CatalogueRetryWrapper.hpp
+++ b/catalogue/CatalogueRetryWrapper.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -241,8 +241,8 @@ public:
     return retryOnLostConnection(m_log, [&]{return m_catalogue->deleteTapePool(name);}, m_maxTriesToConnect);
   }
 
-  std::list<TapePool> getTapePools() const override {
-    return retryOnLostConnection(m_log, [&]{return m_catalogue->getTapePools();}, m_maxTriesToConnect);
+  std::list<TapePool> getTapePools(const TapePoolSearchCriteria &searchCriteria) const override {
+    return retryOnLostConnection(m_log, [&]{return m_catalogue->getTapePools(searchCriteria);}, m_maxTriesToConnect);
   }
 
   cta::optional<TapePool> getTapePool(const std::string &tapePoolName) const override {
diff --git a/catalogue/CatalogueSchema.cpp b/catalogue/CatalogueSchema.cpp
index 3bdd194813f738dbf7e5e3115ac8ad0cd7204421..383e4ac75ff77e25809e571141c07cafc0e451d9 100644
--- a/catalogue/CatalogueSchema.cpp
+++ b/catalogue/CatalogueSchema.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/CatalogueSchema.hpp b/catalogue/CatalogueSchema.hpp
index a13e0f832df62a71dc8942d7eaea5f8cdbced82b..0a4c25bc2b3b47c89dd74c60d49248811bfa5052 100644
--- a/catalogue/CatalogueSchema.hpp
+++ b/catalogue/CatalogueSchema.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/CatalogueTest.cpp b/catalogue/CatalogueTest.cpp
index 5c7952cfc543df20e7bc52d994b43f98723ef51c..3ca691bf769e301488e5db35ce74b25cd441d5c8 100644
--- a/catalogue/CatalogueTest.cpp
+++ b/catalogue/CatalogueTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -22,6 +22,7 @@
 #include "common/dataStructures/EntryLog.hpp"
 #include "common/exception/Exception.hpp"
 #include "common/exception/UserError.hpp"
+#include "common/exception/UserErrorWithCacheInfo.hpp"
 #include "common/make_unique.hpp"
 #include "common/SourcedParameter.hpp"
 #include "common/threading/Mutex.hpp"
@@ -3024,6 +3025,250 @@ TEST_P(cta_catalogue_CatalogueTest, modifyTapePoolSupply_nonExistentTapePool) {
   ASSERT_THROW(m_catalogue->modifyTapePoolSupply(m_admin, tapePoolName, supply), exception::UserError);
 }
 
+TEST_P(cta_catalogue_CatalogueTest, getTapePools_filterName) {
+  using namespace cta;
+
+  const std::string tapePoolName = "tape_pool";
+  const std::string secondTapePoolName = "tape_pool_2";
+
+  const uint64_t nbFirstPoolPartialTapes = 2;
+  const uint64_t nbSecondPoolPartialTapes = 3;
+
+  const bool firstPoolIsEncrypted = true;
+  const bool secondPoolIsEncrypted = false;
+
+  const cta::optional<std::string> firstPoolSupply("value for the supply first pool mechanism");
+  const cta::optional<std::string> secondPoolSupply("value for the supply second pool mechanism");
+
+  const std::string firstPoolComment = "Create first tape pool";
+  const std::string secondPoolComment = "Create second tape pool";
+
+  m_catalogue->createVirtualOrganization(m_admin, m_vo);
+  m_catalogue->createVirtualOrganization(m_admin, m_anotherVo);
+
+  m_catalogue->createTapePool(m_admin, tapePoolName, m_vo.name, nbFirstPoolPartialTapes, firstPoolIsEncrypted, firstPoolSupply, firstPoolComment);
+  m_catalogue->createTapePool(m_admin, secondTapePoolName, m_anotherVo.name, nbSecondPoolPartialTapes, secondPoolIsEncrypted, secondPoolSupply, secondPoolComment);
+
+
+  {
+    cta::catalogue::TapePoolSearchCriteria criteria;
+    criteria.name = tapePoolName;
+    const auto pools = m_catalogue->getTapePools(criteria);
+    ASSERT_EQ(1, pools.size());
+
+    const auto &pool = pools.front();
+    ASSERT_EQ(tapePoolName, pool.name);
+    ASSERT_EQ(m_vo.name, pool.vo.name);
+    ASSERT_EQ(nbFirstPoolPartialTapes, pool.nbPartialTapes);
+    ASSERT_EQ(firstPoolIsEncrypted, pool.encryption);
+    ASSERT_TRUE((bool)pool.supply);
+    ASSERT_EQ(0, pool.nbTapes);
+    ASSERT_EQ(0, pool.capacityBytes);
+    ASSERT_EQ(0, pool.dataBytes);
+    ASSERT_EQ(0, pool.nbPhysicalFiles);
+    ASSERT_EQ(firstPoolComment, pool.comment);
+
+    const common::dataStructures::EntryLog creationLog = pool.creationLog;
+    ASSERT_EQ(m_admin.username, creationLog.username);
+    ASSERT_EQ(m_admin.host, creationLog.host);
+  }
+
+  {
+    cta::catalogue::TapePoolSearchCriteria criteria;
+    criteria.name = secondTapePoolName;
+    const auto pools = m_catalogue->getTapePools(criteria);
+    ASSERT_EQ(1, pools.size());
+
+    const auto &pool = pools.front();
+    ASSERT_EQ(secondTapePoolName, pool.name);
+    ASSERT_EQ(m_anotherVo.name, pool.vo.name);
+    ASSERT_EQ(nbSecondPoolPartialTapes, pool.nbPartialTapes);
+    ASSERT_EQ(secondPoolIsEncrypted, pool.encryption);
+    ASSERT_TRUE((bool)pool.supply);
+    ASSERT_EQ(0, pool.nbTapes);
+    ASSERT_EQ(0, pool.capacityBytes);
+    ASSERT_EQ(0, pool.dataBytes);
+    ASSERT_EQ(0, pool.nbPhysicalFiles);
+    ASSERT_EQ(secondPoolComment, pool.comment);
+
+    const common::dataStructures::EntryLog creationLog = pool.creationLog;
+    ASSERT_EQ(m_admin.username, creationLog.username);
+    ASSERT_EQ(m_admin.host, creationLog.host);
+  }
+
+  {
+    cta::catalogue::TapePoolSearchCriteria criteria;
+    criteria.name = "no pool with such name";
+
+    ASSERT_THROW(m_catalogue->getTapePools(criteria), catalogue::UserSpecifiedANonExistentTapePool);
+  }
+
+  {
+    cta::catalogue::TapePoolSearchCriteria criteria;
+    criteria.name = "";
+
+    ASSERT_THROW(m_catalogue->getTapePools(criteria), exception::UserError);
+  }
+}
+
+TEST_P(cta_catalogue_CatalogueTest, getTapePools_filterVO) {
+  using namespace cta;
+
+  const std::string tapePoolName = "tape_pool";
+  const std::string secondTapePoolName = "tape_pool_2";
+
+  const uint64_t nbFirstPoolPartialTapes = 2;
+  const uint64_t nbSecondPoolPartialTapes = 3;
+
+  const bool firstPoolIsEncrypted = true;
+  const bool secondPoolIsEncrypted = false;
+
+  const cta::optional<std::string> firstPoolSupply("value for the supply first pool mechanism");
+  const cta::optional<std::string> secondPoolSupply("value for the supply second pool mechanism");
+
+  const std::string firstPoolComment = "Create first tape pool";
+  const std::string secondPoolComment = "Create second tape pool";
+
+  m_catalogue->createVirtualOrganization(m_admin, m_vo);
+  m_catalogue->createVirtualOrganization(m_admin, m_anotherVo);
+
+  m_catalogue->createTapePool(m_admin, tapePoolName, m_vo.name, nbFirstPoolPartialTapes, firstPoolIsEncrypted, firstPoolSupply, firstPoolComment);
+  m_catalogue->createTapePool(m_admin, secondTapePoolName, m_anotherVo.name, nbSecondPoolPartialTapes, secondPoolIsEncrypted, secondPoolSupply, secondPoolComment);
+
+
+  {
+    cta::catalogue::TapePoolSearchCriteria criteria;
+    criteria.vo = m_vo.name;
+    const auto pools = m_catalogue->getTapePools(criteria);
+    ASSERT_EQ(1, pools.size());
+
+    const auto &pool = pools.front();
+    ASSERT_EQ(tapePoolName, pool.name);
+    ASSERT_EQ(m_vo.name, pool.vo.name);
+    ASSERT_EQ(nbFirstPoolPartialTapes, pool.nbPartialTapes);
+    ASSERT_EQ(firstPoolIsEncrypted, pool.encryption);
+    ASSERT_TRUE((bool)pool.supply);
+    ASSERT_EQ(0, pool.nbTapes);
+    ASSERT_EQ(0, pool.capacityBytes);
+    ASSERT_EQ(0, pool.dataBytes);
+    ASSERT_EQ(0, pool.nbPhysicalFiles);
+    ASSERT_EQ(firstPoolComment, pool.comment);
+
+    const common::dataStructures::EntryLog creationLog = pool.creationLog;
+    ASSERT_EQ(m_admin.username, creationLog.username);
+    ASSERT_EQ(m_admin.host, creationLog.host);
+  }
+
+  {
+    cta::catalogue::TapePoolSearchCriteria criteria;
+    criteria.vo = m_anotherVo.name;
+    const auto pools = m_catalogue->getTapePools(criteria);
+    ASSERT_EQ(1, pools.size());
+
+    const auto &pool = pools.front();
+    ASSERT_EQ(secondTapePoolName, pool.name);
+    ASSERT_EQ(m_anotherVo.name, pool.vo.name);
+    ASSERT_EQ(nbSecondPoolPartialTapes, pool.nbPartialTapes);
+    ASSERT_EQ(secondPoolIsEncrypted, pool.encryption);
+    ASSERT_TRUE((bool)pool.supply);
+    ASSERT_EQ(0, pool.nbTapes);
+    ASSERT_EQ(0, pool.capacityBytes);
+    ASSERT_EQ(0, pool.dataBytes);
+    ASSERT_EQ(0, pool.nbPhysicalFiles);
+    ASSERT_EQ(secondPoolComment, pool.comment);
+
+    const common::dataStructures::EntryLog creationLog = pool.creationLog;
+    ASSERT_EQ(m_admin.username, creationLog.username);
+    ASSERT_EQ(m_admin.host, creationLog.host);
+  }
+
+  {
+    cta::catalogue::TapePoolSearchCriteria criteria;
+    criteria.vo = "no vo with such name";
+
+    ASSERT_THROW(m_catalogue->getTapePools(criteria), catalogue::UserSpecifiedANonExistentVirtualOrganization);
+  }
+
+  {
+    cta::catalogue::TapePoolSearchCriteria criteria;
+    criteria.vo = "";
+
+    ASSERT_THROW(m_catalogue->getTapePools(criteria), exception::UserError);
+  }
+}
+
+TEST_P(cta_catalogue_CatalogueTest, getTapePools_filterEncrypted) {
+  using namespace cta;
+
+  const std::string tapePoolName = "tape_pool";
+  const std::string secondTapePoolName = "tape_pool_2";
+
+  const uint64_t nbFirstPoolPartialTapes = 2;
+  const uint64_t nbSecondPoolPartialTapes = 3;
+
+  const bool firstPoolIsEncrypted = true;
+  const bool secondPoolIsEncrypted = false;
+
+  const cta::optional<std::string> firstPoolSupply("value for the supply first pool mechanism");
+  const cta::optional<std::string> secondPoolSupply("value for the supply second pool mechanism");
+
+  const std::string firstPoolComment = "Create first tape pool";
+  const std::string secondPoolComment = "Create second tape pool";
+
+  m_catalogue->createVirtualOrganization(m_admin, m_vo);
+  m_catalogue->createVirtualOrganization(m_admin, m_anotherVo);
+
+  m_catalogue->createTapePool(m_admin, tapePoolName, m_vo.name, nbFirstPoolPartialTapes, firstPoolIsEncrypted, firstPoolSupply, firstPoolComment);
+  m_catalogue->createTapePool(m_admin, secondTapePoolName, m_anotherVo.name, nbSecondPoolPartialTapes, secondPoolIsEncrypted, secondPoolSupply, secondPoolComment);
+
+
+  {
+    cta::catalogue::TapePoolSearchCriteria criteria;
+    criteria.encrypted = true;
+    const auto pools = m_catalogue->getTapePools(criteria);
+    ASSERT_EQ(1, pools.size());
+
+    const auto &pool = pools.front();
+    ASSERT_EQ(tapePoolName, pool.name);
+    ASSERT_EQ(m_vo.name, pool.vo.name);
+    ASSERT_EQ(nbFirstPoolPartialTapes, pool.nbPartialTapes);
+    ASSERT_EQ(firstPoolIsEncrypted, pool.encryption);
+    ASSERT_TRUE((bool)pool.supply);
+    ASSERT_EQ(0, pool.nbTapes);
+    ASSERT_EQ(0, pool.capacityBytes);
+    ASSERT_EQ(0, pool.dataBytes);
+    ASSERT_EQ(0, pool.nbPhysicalFiles);
+    ASSERT_EQ(firstPoolComment, pool.comment);
+
+    const common::dataStructures::EntryLog creationLog = pool.creationLog;
+    ASSERT_EQ(m_admin.username, creationLog.username);
+    ASSERT_EQ(m_admin.host, creationLog.host);
+  }
+
+  {
+    cta::catalogue::TapePoolSearchCriteria criteria;
+    criteria.encrypted = false;
+    const auto pools = m_catalogue->getTapePools(criteria);
+    ASSERT_EQ(1, pools.size());
+
+    const auto &pool = pools.front();
+    ASSERT_EQ(secondTapePoolName, pool.name);
+    ASSERT_EQ(m_anotherVo.name, pool.vo.name);
+    ASSERT_EQ(nbSecondPoolPartialTapes, pool.nbPartialTapes);
+    ASSERT_EQ(secondPoolIsEncrypted, pool.encryption);
+    ASSERT_TRUE((bool)pool.supply);
+    ASSERT_EQ(0, pool.nbTapes);
+    ASSERT_EQ(0, pool.capacityBytes);
+    ASSERT_EQ(0, pool.dataBytes);
+    ASSERT_EQ(0, pool.nbPhysicalFiles);
+    ASSERT_EQ(secondPoolComment, pool.comment);
+
+    const common::dataStructures::EntryLog creationLog = pool.creationLog;
+    ASSERT_EQ(m_admin.username, creationLog.username);
+    ASSERT_EQ(m_admin.host, creationLog.host);
+  }
+}
+
 TEST_P(cta_catalogue_CatalogueTest, createArchiveRoute) {
   using namespace cta;
 
@@ -7405,7 +7650,7 @@ TEST_P(cta_catalogue_CatalogueTest, checkAndGetNextArchiveFileId_no_mount_rules)
   requesterIdentity.name = requesterName;
   requesterIdentity.group = "group";
 
-  ASSERT_THROW(m_catalogue->checkAndGetNextArchiveFileId(diskInstance, m_storageClassSingleCopy.name, requesterIdentity), exception::UserError);
+  ASSERT_THROW(m_catalogue->checkAndGetNextArchiveFileId(diskInstance, m_storageClassSingleCopy.name, requesterIdentity), exception::UserErrorWithCacheInfo);
 }
 
 TEST_P(cta_catalogue_CatalogueTest, checkAndGetNextArchiveFileId_after_cached_and_then_deleted_requester_mount_rule) {
@@ -7482,7 +7727,7 @@ TEST_P(cta_catalogue_CatalogueTest, checkAndGetNextArchiveFileId_after_cached_an
   // Try to get an archive ID which should now fail because there is no user
   // mount rule and the invalidated user mount rule cache should not hide this
   // fact
-  ASSERT_THROW(m_catalogue->checkAndGetNextArchiveFileId(diskInstanceName, m_storageClassSingleCopy.name, requesterIdentity), exception::UserError);
+  ASSERT_THROW(m_catalogue->checkAndGetNextArchiveFileId(diskInstanceName, m_storageClassSingleCopy.name, requesterIdentity), exception::UserErrorWithCacheInfo);
 }
 
 TEST_P(cta_catalogue_CatalogueTest, checkAndGetNextArchiveFileId_requester_mount_rule) {
@@ -7698,7 +7943,7 @@ TEST_P(cta_catalogue_CatalogueTest, checkAndGetNextArchiveFileId_after_cached_an
   // Try to get an archive ID which should now fail because there is no group
   // mount rule and the invalidated group mount rule cache should not hide this
   // fact
-  ASSERT_THROW(m_catalogue->checkAndGetNextArchiveFileId(diskInstanceName, m_storageClassSingleCopy.name, requesterIdentity), exception::UserError);
+  ASSERT_THROW(m_catalogue->checkAndGetNextArchiveFileId(diskInstanceName, m_storageClassSingleCopy.name, requesterIdentity), exception::UserErrorWithCacheInfo);
 }
 
 TEST_P(cta_catalogue_CatalogueTest, checkAndGetNextArchiveFileId_requester_mount_rule_overide) {
diff --git a/catalogue/CatalogueTest.hpp b/catalogue/CatalogueTest.hpp
index c0fb07c268d209a87de3df5aff4022f98f8c3794..b15bb24f6b9e6a3f3c22bec44c2997921388acfa 100644
--- a/catalogue/CatalogueTest.hpp
+++ b/catalogue/CatalogueTest.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/CmdLineTool.cpp b/catalogue/CmdLineTool.cpp
index 7b662e0eb7a3d2a691ea60c4e1d8863890a8e585..f0a75f0ffd7e3e2319525b01a3c842a3d34523f3 100644
--- a/catalogue/CmdLineTool.cpp
+++ b/catalogue/CmdLineTool.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/CmdLineTool.hpp b/catalogue/CmdLineTool.hpp
index 8f27a40a368be1c1757bed5e495f256abcf5b55d..54b1c45bcfdeb674f2447967bc8386d11757e40f 100644
--- a/catalogue/CmdLineTool.hpp
+++ b/catalogue/CmdLineTool.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/CreateAdminUserCmd.cpp b/catalogue/CreateAdminUserCmd.cpp
index 85bc1e0b0c6ba80874fe8287b7d7379227228a2a..6d5def01b197746d6c8427171ff1c3df301e3f6c 100644
--- a/catalogue/CreateAdminUserCmd.cpp
+++ b/catalogue/CreateAdminUserCmd.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/CreateAdminUserCmd.hpp b/catalogue/CreateAdminUserCmd.hpp
index c3d5052e69a01ab72d39710226d79064d19b9549..43961be945bb6aa5cc9c279b5efc212792be71af 100644
--- a/catalogue/CreateAdminUserCmd.hpp
+++ b/catalogue/CreateAdminUserCmd.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/CreateAdminUserCmdLineArgs.cpp b/catalogue/CreateAdminUserCmdLineArgs.cpp
index 3ce3dca29e3d109677234b9baea33bdeb3e59e59..117f71d388ad56e5a5315ae2295a4ad24107ce86 100644
--- a/catalogue/CreateAdminUserCmdLineArgs.cpp
+++ b/catalogue/CreateAdminUserCmdLineArgs.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/CreateAdminUserCmdLineArgs.hpp b/catalogue/CreateAdminUserCmdLineArgs.hpp
index f512875851b43d237ec81f41dce07efb2203ae50..1120c65ae96e3862e55499906b58d970a23e30f5 100644
--- a/catalogue/CreateAdminUserCmdLineArgs.hpp
+++ b/catalogue/CreateAdminUserCmdLineArgs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/CreateAdminUserCmdLineArgsTest.cpp b/catalogue/CreateAdminUserCmdLineArgsTest.cpp
index 2587fc4dd12787b88b4a66679ae05ea7aa16e922..b65c671691008afc71de5bc8998ca01d376cb4b8 100644
--- a/catalogue/CreateAdminUserCmdLineArgsTest.cpp
+++ b/catalogue/CreateAdminUserCmdLineArgsTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/CreateAdminUserCmdMain.cpp b/catalogue/CreateAdminUserCmdMain.cpp
index cf9248492dfdfd2a5e95dab2e903ab30ddab2502..bd9b3d28a1aee803405fa97975d56174f9ed5100 100644
--- a/catalogue/CreateAdminUserCmdMain.cpp
+++ b/catalogue/CreateAdminUserCmdMain.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/CreateMountPolicyAttributes.hpp b/catalogue/CreateMountPolicyAttributes.hpp
index 79e31b2fac46e0fcd20b21ae3e53639b96332f85..9ae031d71a05af90cc9d8c9ff1825a902b326f97 100644
--- a/catalogue/CreateMountPolicyAttributes.hpp
+++ b/catalogue/CreateMountPolicyAttributes.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/CreateSchemaCmd.cpp b/catalogue/CreateSchemaCmd.cpp
index a09e172d3a83cebb7b3debaf92ebcd4be7da5a0c..7a4e22a70e9c2b91303045c6f8a0d6058c467d01 100644
--- a/catalogue/CreateSchemaCmd.cpp
+++ b/catalogue/CreateSchemaCmd.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/CreateSchemaCmd.hpp b/catalogue/CreateSchemaCmd.hpp
index 01a17eeddfafc8985a156c44c5f5c5ebac845210..52b1d9a872330ee2509c34154053cce9197f25aa 100644
--- a/catalogue/CreateSchemaCmd.hpp
+++ b/catalogue/CreateSchemaCmd.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/CreateSchemaCmdLineArgs.cpp b/catalogue/CreateSchemaCmdLineArgs.cpp
index e4c3a8d576e750bcf0554f0e1f329ae28790aa04..bf6f8510caf08b66d51d5d6d817ac987e4db4692 100644
--- a/catalogue/CreateSchemaCmdLineArgs.cpp
+++ b/catalogue/CreateSchemaCmdLineArgs.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/CreateSchemaCmdLineArgs.hpp b/catalogue/CreateSchemaCmdLineArgs.hpp
index 2e69c833e2e13870b05f06ad9dc7ef89db9938be..1a4076e98a7095dbf38becb025d1e333c773a9f3 100644
--- a/catalogue/CreateSchemaCmdLineArgs.hpp
+++ b/catalogue/CreateSchemaCmdLineArgs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/CreateSchemaCmdLineArgsTest.cpp b/catalogue/CreateSchemaCmdLineArgsTest.cpp
index 4b84edd36674b115db17d02b66af544da0ec20be..36247873e7e36c2cb789d3bf5e9e5cd516a20afa 100644
--- a/catalogue/CreateSchemaCmdLineArgsTest.cpp
+++ b/catalogue/CreateSchemaCmdLineArgsTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/CreateSchemaCmdMain.cpp b/catalogue/CreateSchemaCmdMain.cpp
index 305abbf17bfb367d5b556fe8a60cec5e87d855b1..7be0c0b42c7db6fbb9743ec2d6573aed5197afbb 100644
--- a/catalogue/CreateSchemaCmdMain.cpp
+++ b/catalogue/CreateSchemaCmdMain.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/CreateTapeAttributes.hpp b/catalogue/CreateTapeAttributes.hpp
index 2b00002337af1f06e5a8e1d535c0dfbf661abecd..f5318aef2b8c1af1324e02604b754aeed326bfa4 100644
--- a/catalogue/CreateTapeAttributes.hpp
+++ b/catalogue/CreateTapeAttributes.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/DatabaseMetadataGetter.cpp b/catalogue/DatabaseMetadataGetter.cpp
index 19a675ed5d79806d4d57541496c6b0486293a556..ecd1c6fcdc612d05362aa0f0030514dd4bc47af8 100644
--- a/catalogue/DatabaseMetadataGetter.cpp
+++ b/catalogue/DatabaseMetadataGetter.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/DatabaseMetadataGetter.hpp b/catalogue/DatabaseMetadataGetter.hpp
index a4d9410ad8c888117de6161412a3b0a50bb49f3f..c7a5e7e5d2eaa3f0a391b50634d650516858a84d 100644
--- a/catalogue/DatabaseMetadataGetter.hpp
+++ b/catalogue/DatabaseMetadataGetter.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/DbConfigVersionOfCatalogueTest.cpp b/catalogue/DbConfigVersionOfCatalogueTest.cpp
index 2ef531d2a86be3c6e7931f2ac272ca062b6c1503..9097fa7d08ae307b50311bf16647119cbe401a55 100644
--- a/catalogue/DbConfigVersionOfCatalogueTest.cpp
+++ b/catalogue/DbConfigVersionOfCatalogueTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/DbToSQLiteStatementTransformer.cpp b/catalogue/DbToSQLiteStatementTransformer.cpp
index 2277e1786fda46ea36a632326a50224e0d6262ec..a1302dc2f84d7cfad944b82d00eb85ef0ae5d93a 100644
--- a/catalogue/DbToSQLiteStatementTransformer.cpp
+++ b/catalogue/DbToSQLiteStatementTransformer.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/DbToSQLiteStatementTransformer.hpp b/catalogue/DbToSQLiteStatementTransformer.hpp
index 6ba3775b5f1ec5ced7a2dec56b1ded0739f6c66e..ec73e319a6294f6776860e768125c494b665de34 100644
--- a/catalogue/DbToSQLiteStatementTransformer.hpp
+++ b/catalogue/DbToSQLiteStatementTransformer.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/DropSchemaCmd.cpp b/catalogue/DropSchemaCmd.cpp
index d2813e72f50f88794cdca7996149adbdf555268d..afd19c96433327e3d7912e4acd819a1459b0e446 100644
--- a/catalogue/DropSchemaCmd.cpp
+++ b/catalogue/DropSchemaCmd.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/DropSchemaCmd.hpp b/catalogue/DropSchemaCmd.hpp
index ca73c9ea19068ae560d219b8c253e4942ff9aa1e..20a0dc436e999902055f3229ceb44fec5ba384de 100644
--- a/catalogue/DropSchemaCmd.hpp
+++ b/catalogue/DropSchemaCmd.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/DropSchemaCmdLineArgs.cpp b/catalogue/DropSchemaCmdLineArgs.cpp
index 326c3219dbfa8a1e60b9f1757f05a910530cc847..88cc5b4f5dac69387ad7e307462115560f87ee29 100644
--- a/catalogue/DropSchemaCmdLineArgs.cpp
+++ b/catalogue/DropSchemaCmdLineArgs.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/DropSchemaCmdLineArgs.hpp b/catalogue/DropSchemaCmdLineArgs.hpp
index 3289c0dee22e147f67c18df2c5889d57e0065755..29b38f87e364ceb4f8ab4893b06dcf1306e85872 100644
--- a/catalogue/DropSchemaCmdLineArgs.hpp
+++ b/catalogue/DropSchemaCmdLineArgs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/DropSchemaCmdLineArgsTest.cpp b/catalogue/DropSchemaCmdLineArgsTest.cpp
index c752db82a74d6ea4a91ed1c215d1e56de32d7824..cfdcec23a6ad61c56a0149d852cf0ed0700f0d47 100644
--- a/catalogue/DropSchemaCmdLineArgsTest.cpp
+++ b/catalogue/DropSchemaCmdLineArgsTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/DropSchemaCmdMain.cpp b/catalogue/DropSchemaCmdMain.cpp
index 9cbef48f369e2e19dc69be5da5df551689fb49ec..d1d71392c6db8e7f16ae7837f8f2e068df0a7cf1 100644
--- a/catalogue/DropSchemaCmdMain.cpp
+++ b/catalogue/DropSchemaCmdMain.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/DummyCatalogue.hpp b/catalogue/DummyCatalogue.hpp
index c58197c8e3325bcc1a136e57f34427a6f5d49572..fc47d051dc12763d4634a42bd128eb0153acb532 100644
--- a/catalogue/DummyCatalogue.hpp
+++ b/catalogue/DummyCatalogue.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -103,7 +103,7 @@ public:
   std::list<common::dataStructures::RequesterMountRule> getRequesterMountRules() const { throw exception::Exception(std::string("In ")+__PRETTY_FUNCTION__+": not implemented"); }
   std::list<common::dataStructures::StorageClass> getStorageClasses() const { throw exception::Exception(std::string("In ")+__PRETTY_FUNCTION__+": not implemented"); }
   common::dataStructures::ArchiveFileSummary getTapeFileSummary(const TapeFileSearchCriteria& searchCriteria) const { throw exception::Exception(std::string("In ")+__PRETTY_FUNCTION__+": not implemented"); }
-  std::list<TapePool> getTapePools() const { throw exception::Exception(std::string("In ")+__PRETTY_FUNCTION__+": not implemented"); }
+  std::list<TapePool> getTapePools(const TapePoolSearchCriteria &searchCriteria) const { throw exception::Exception(std::string("In ")+__PRETTY_FUNCTION__+": not implemented"); }
   cta::optional<TapePool> getTapePool(const std::string &tapePoolName) const override { throw exception::Exception(std::string("In ")+__PRETTY_FUNCTION__+": not implemented"); }
   std::list<common::dataStructures::Tape> getTapes(const TapeSearchCriteria& searchCriteria) const { throw exception::Exception(std::string("In ")+__PRETTY_FUNCTION__+": not implemented"); }
  // getTapesByVid is implemented below (and works).
diff --git a/catalogue/InMemoryCatalogue.cpp b/catalogue/InMemoryCatalogue.cpp
index 307b09d8adbf95db1030d9906927eed7bdc39288..5f072331e47f94f237074e219c8affe5df75ba11 100644
--- a/catalogue/InMemoryCatalogue.cpp
+++ b/catalogue/InMemoryCatalogue.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/InMemoryCatalogue.hpp b/catalogue/InMemoryCatalogue.hpp
index a86378ef29eeaf9b061c38fd2afcd1fd4c422343..45267b6c0b631dd717ecd4710a61d18ef263f5dd 100644
--- a/catalogue/InMemoryCatalogue.hpp
+++ b/catalogue/InMemoryCatalogue.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/InMemoryCatalogueFactory.cpp b/catalogue/InMemoryCatalogueFactory.cpp
index 8d20da26d430201396d01c1d7b4b74e34f581e5b..82937a864ca7727aeea4a1b983198b4e79d8a6d2 100644
--- a/catalogue/InMemoryCatalogueFactory.cpp
+++ b/catalogue/InMemoryCatalogueFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/InMemoryCatalogueFactory.hpp b/catalogue/InMemoryCatalogueFactory.hpp
index 504aca8492702e424b7c753f8a3a42f38ba2d371..67bfd2d720a59b58a4ed55869458b28d550fd2a3 100644
--- a/catalogue/InMemoryCatalogueFactory.hpp
+++ b/catalogue/InMemoryCatalogueFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/InMemoryCatalogueTest.cpp b/catalogue/InMemoryCatalogueTest.cpp
index faf1efc8a676e5dbfc0b282bd642908cbdaa530a..59e3b719316f4d8207eba25a11bdf529f217dbba 100644
--- a/catalogue/InMemoryCatalogueTest.cpp
+++ b/catalogue/InMemoryCatalogueTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/InMemoryVersionOfCatalogueTest.cpp b/catalogue/InMemoryVersionOfCatalogueTest.cpp
index 2000d32a7cbc2e526db81f2aa4452eab1b273a20..ca16245ec7c0a0a0dd76707bc4893c5073afab3f 100644
--- a/catalogue/InMemoryVersionOfCatalogueTest.cpp
+++ b/catalogue/InMemoryVersionOfCatalogueTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/InsertFileRecycleLog.hpp b/catalogue/InsertFileRecycleLog.hpp
index d796808d64c32f5ea5eb4b503b776956bea24dba..bc108dbc9d12c8ce0a914dbd0f1264ad54bb4b7f 100644
--- a/catalogue/InsertFileRecycleLog.hpp
+++ b/catalogue/InsertFileRecycleLog.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/MediaType.hpp b/catalogue/MediaType.hpp
index 2459fc6b863981780b2d8513c84c028559d885a0..79be0db81f135c44011ed6b1dce2f5fff34c1b2c 100644
--- a/catalogue/MediaType.hpp
+++ b/catalogue/MediaType.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/MediaTypeWithLogs.hpp b/catalogue/MediaTypeWithLogs.hpp
index d0934b5a1f40064ffc759f12767d1a3cb1c8ac99..bee383ad74594f4aa4e0337a08b778a7002ff34f 100644
--- a/catalogue/MediaTypeWithLogs.hpp
+++ b/catalogue/MediaTypeWithLogs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/MysqlCatalogue.cpp b/catalogue/MysqlCatalogue.cpp
index 5fde0564c7de7ceb52c501349ed18c3f46d3e80d..552bb129738fc641f0fd9894dec7dce33ca8d106 100644
--- a/catalogue/MysqlCatalogue.cpp
+++ b/catalogue/MysqlCatalogue.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/MysqlCatalogue.hpp b/catalogue/MysqlCatalogue.hpp
index bcb30942b9451bf8bc3336191ffd2585aa24edc4..1e6b178516ffd0d820f360981e39e882f5e69b07 100644
--- a/catalogue/MysqlCatalogue.hpp
+++ b/catalogue/MysqlCatalogue.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/MysqlCatalogueFactory.cpp b/catalogue/MysqlCatalogueFactory.cpp
index f5cad597212edeaa0c309e3b53ffd6dc9ebc9a67..396f5f59e832deed217a61e91ad42741036a60a9 100644
--- a/catalogue/MysqlCatalogueFactory.cpp
+++ b/catalogue/MysqlCatalogueFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/MysqlCatalogueFactory.hpp b/catalogue/MysqlCatalogueFactory.hpp
index 5804dc839b7286232790dccc23016ec94ce2948e..02df6e68afc9c4d6c4c5cdef41ce1ea4e6fcd404 100644
--- a/catalogue/MysqlCatalogueFactory.hpp
+++ b/catalogue/MysqlCatalogueFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/MysqlCatalogueSchema.before_SQL.cpp b/catalogue/MysqlCatalogueSchema.before_SQL.cpp
index f58d18706084140a426a9dee3c28680f50208cef..bc384650fccbaddc4b782851d5d105be7ada574e 100644
--- a/catalogue/MysqlCatalogueSchema.before_SQL.cpp
+++ b/catalogue/MysqlCatalogueSchema.before_SQL.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/MysqlCatalogueSchema.hpp b/catalogue/MysqlCatalogueSchema.hpp
index 704284a35a6ffb7021ae78ed2f3564d29b3a55ed..be5ab2a88b9d3a8dd4f5dca7ccf1f98704252b53 100644
--- a/catalogue/MysqlCatalogueSchema.hpp
+++ b/catalogue/MysqlCatalogueSchema.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/OracleCatalogue.cpp b/catalogue/OracleCatalogue.cpp
index a867ff00fc673a64c0c4a4d3ab6e0da5c59df5d7..08e63e5afd379df8d58b4a5ee7500276b4ffb9b4 100644
--- a/catalogue/OracleCatalogue.cpp
+++ b/catalogue/OracleCatalogue.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/OracleCatalogue.hpp b/catalogue/OracleCatalogue.hpp
index 0fa79b1b6c71e6178ca7f37de42c31caeb8ceee1..03067d1d544fea1e53e3e4ceccaaaa6bf9459a53 100644
--- a/catalogue/OracleCatalogue.hpp
+++ b/catalogue/OracleCatalogue.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/OracleCatalogueFactory.cpp b/catalogue/OracleCatalogueFactory.cpp
index 46ae69c69d01a30c2ebb90a5b08d91a63a1fb5e3..a5eda2ed05cc7fb96aa316b72fbc4abfd8f2f29d 100644
--- a/catalogue/OracleCatalogueFactory.cpp
+++ b/catalogue/OracleCatalogueFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/OracleCatalogueFactory.hpp b/catalogue/OracleCatalogueFactory.hpp
index 899262cee50078f9a76bb0f44d7d033a14cc4467..42fe58c26f908e1d5a2fdc7229b5e0746427834d 100644
--- a/catalogue/OracleCatalogueFactory.hpp
+++ b/catalogue/OracleCatalogueFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/OracleCatalogueSchema.before_SQL.cpp b/catalogue/OracleCatalogueSchema.before_SQL.cpp
index 3d7e848a51a4bd2c089793e3fd2c7c0cf944b27d..efa4db7b3e1190b1934fba3bb4d781619754ee93 100644
--- a/catalogue/OracleCatalogueSchema.before_SQL.cpp
+++ b/catalogue/OracleCatalogueSchema.before_SQL.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/OracleCatalogueSchema.hpp b/catalogue/OracleCatalogueSchema.hpp
index 9a197bd4b6ffc23780aca018abb235fe6b2c9c85..a405944d7afd35d14dd48021b896b3972dc6b030 100644
--- a/catalogue/OracleCatalogueSchema.hpp
+++ b/catalogue/OracleCatalogueSchema.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/PollDatabaseCmd.cpp b/catalogue/PollDatabaseCmd.cpp
index f7952acee47fcb6bd85a3cddd7add6fc7f8a26c4..461493638dd07d70877b7c516e793ae132a40992 100644
--- a/catalogue/PollDatabaseCmd.cpp
+++ b/catalogue/PollDatabaseCmd.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/PollDatabaseCmd.hpp b/catalogue/PollDatabaseCmd.hpp
index f29a1fecc2ec9256cbfe717dcacda7a3e6540682..e816a850d53725c23dc73648ad2181819f0cbe8f 100644
--- a/catalogue/PollDatabaseCmd.hpp
+++ b/catalogue/PollDatabaseCmd.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/PollDatabaseCmdLineArgs.cpp b/catalogue/PollDatabaseCmdLineArgs.cpp
index 22f4f91a3c788084c85d57037b876ce3dc13d86e..717df3cccbedd93341a81ffee270971342e0b432 100644
--- a/catalogue/PollDatabaseCmdLineArgs.cpp
+++ b/catalogue/PollDatabaseCmdLineArgs.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/PollDatabaseCmdLineArgs.hpp b/catalogue/PollDatabaseCmdLineArgs.hpp
index 9e447e6f7d9e5ee117c90d93c2b118d5e8712f55..1e2a90013d3f6489debad0a46464715df04c1332 100644
--- a/catalogue/PollDatabaseCmdLineArgs.hpp
+++ b/catalogue/PollDatabaseCmdLineArgs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/PollDatabaseCmdLineArgsTest.cpp b/catalogue/PollDatabaseCmdLineArgsTest.cpp
index 3aa869c4a4d6303988c05f1eea77584a09eb0788..fdc41de3a11670852c5acd7fa195032149704b86 100644
--- a/catalogue/PollDatabaseCmdLineArgsTest.cpp
+++ b/catalogue/PollDatabaseCmdLineArgsTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/PollDatabaseCmdMain.cpp b/catalogue/PollDatabaseCmdMain.cpp
index 79377d09a979b99a0b67db5eb8bc89a9c94a9ae5..8f6793907a244cafa4126144a0d4a6ed4d8a952b 100644
--- a/catalogue/PollDatabaseCmdMain.cpp
+++ b/catalogue/PollDatabaseCmdMain.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/PostgresCatalogue.cpp b/catalogue/PostgresCatalogue.cpp
index ce585cd36dc7bc6462e6db08d91da26725514dd7..da343a4a58d41c7fbe436de4b1856f9a4ed7d32b 100644
--- a/catalogue/PostgresCatalogue.cpp
+++ b/catalogue/PostgresCatalogue.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/PostgresCatalogue.hpp b/catalogue/PostgresCatalogue.hpp
index 8db32f8df412de61c7ab7ce87cc88387b239431c..ee2c914b851487d39cd5cc307583aacdb1a65fa7 100644
--- a/catalogue/PostgresCatalogue.hpp
+++ b/catalogue/PostgresCatalogue.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/PostgresCatalogueSchema.before_SQL.cpp b/catalogue/PostgresCatalogueSchema.before_SQL.cpp
index 70d177ac348ce5bbdd66d2722b6ffc9d21e9bb43..f3517fe637b3ff3f74eccd463abf47b567cc6069 100644
--- a/catalogue/PostgresCatalogueSchema.before_SQL.cpp
+++ b/catalogue/PostgresCatalogueSchema.before_SQL.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/PostgresCatalogueSchema.hpp b/catalogue/PostgresCatalogueSchema.hpp
index c38ca4fc0b54567fd4ccb0f9e3acb6ae6904c476..a45464d9d555a635689593f2ff8d013b6aa78349 100644
--- a/catalogue/PostgresCatalogueSchema.hpp
+++ b/catalogue/PostgresCatalogueSchema.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/PostgresqlCatalogueFactory.cpp b/catalogue/PostgresqlCatalogueFactory.cpp
index 61621dcb6ee46b8bde8744a80ab591a57c4abb74..bf7608c2eb45a35863762a41ec0be1739477d43d 100644
--- a/catalogue/PostgresqlCatalogueFactory.cpp
+++ b/catalogue/PostgresqlCatalogueFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/PostgresqlCatalogueFactory.hpp b/catalogue/PostgresqlCatalogueFactory.hpp
index f5703e810793e7cfc1e3775d6563bf3ce4da02e8..dfc1e97929ee83432871e9854edba54b0e56be11 100644
--- a/catalogue/PostgresqlCatalogueFactory.hpp
+++ b/catalogue/PostgresqlCatalogueFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/RdbmsCatalogue.cpp b/catalogue/RdbmsCatalogue.cpp
index 10692b44d52d795819a7fa00c6acb76916c7f876..7f8ddd1c352133886331b33b8cde5cf661fbd724 100644
--- a/catalogue/RdbmsCatalogue.cpp
+++ b/catalogue/RdbmsCatalogue.cpp
@@ -1,6 +1,6 @@
  /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -563,7 +563,7 @@ common::dataStructures::VirtualOrganization RdbmsCatalogue::getCachedVirtualOrga
       auto conn = m_connPool.getConn();
       return getVirtualOrganizationOfTapepool(conn,tapepoolName);
     };
-    return m_tapepoolVirtualOrganizationCache.getCachedValue(tapepoolName,getNonCachedValue);
+    return m_tapepoolVirtualOrganizationCache.getCachedValue(tapepoolName,getNonCachedValue).value;
   } catch(exception::UserError &) {
     throw;
   } catch(exception::Exception &ex) {
@@ -2197,13 +2197,42 @@ void RdbmsCatalogue::deleteTapePool(const std::string &name) {
   }
 }
 
+
 //------------------------------------------------------------------------------
 // getTapePools
 //------------------------------------------------------------------------------
-std::list<TapePool> RdbmsCatalogue::getTapePools() const {
+std::list<TapePool> RdbmsCatalogue::getTapePools(const TapePoolSearchCriteria &searchCriteria) const {
+  try {
+    auto conn = m_connPool.getConn();
+    return getTapePools(conn, searchCriteria);
+  } catch(exception::UserError &) {
+    throw;
+  } catch(exception::Exception &ex) {
+    ex.getMessage().str(std::string(__FUNCTION__) + ": " + ex.getMessage().str());
+    throw;
+  }
+}
+
+
+std::list<TapePool> RdbmsCatalogue::getTapePools(rdbms::Conn &conn, const TapePoolSearchCriteria &searchCriteria) const {
+  if (isSetAndEmpty(searchCriteria.name)) throw exception::UserError("Pool name cannot be an empty string");
+  if (isSetAndEmpty(searchCriteria.vo)) throw exception::UserError("Virtual organisation cannot be an empty string");
   try {
+
+    if (searchCriteria.name && !tapePoolExists(conn, searchCriteria.name.value())) {
+      UserSpecifiedANonExistentTapePool ex;
+      ex.getMessage() << "Cannot list tape pools because tape pool " + searchCriteria.name.value() + " does not exist";
+      throw ex;
+    }
+
+    if (searchCriteria.vo && !virtualOrganizationExists(conn, searchCriteria.vo.value())) {
+      UserSpecifiedANonExistentVirtualOrganization ex;
+      ex.getMessage() << "Cannot list tape pools because virtual organization " + searchCriteria.vo.value() + " does not exist";
+      throw ex;
+    }
+
     std::list<TapePool> pools;
-    const char *const sql =
+    std::string sql =
       "SELECT "
         "TAPE_POOL.TAPE_POOL_NAME AS TAPE_POOL_NAME,"
         "VIRTUAL_ORGANIZATION.VIRTUAL_ORGANIZATION_NAME AS VO,"
@@ -2236,27 +2265,61 @@ std::list<TapePool> RdbmsCatalogue::getTapePools() const {
       "LEFT OUTER JOIN TAPE ON "
         "TAPE_POOL.TAPE_POOL_ID = TAPE.TAPE_POOL_ID "
       "LEFT OUTER JOIN MEDIA_TYPE ON "
-        "TAPE.MEDIA_TYPE_ID = MEDIA_TYPE.MEDIA_TYPE_ID "
-      "GROUP BY "
-        "TAPE_POOL.TAPE_POOL_NAME,"
-        "VIRTUAL_ORGANIZATION.VIRTUAL_ORGANIZATION_NAME,"
-        "TAPE_POOL.NB_PARTIAL_TAPES,"
-        "TAPE_POOL.IS_ENCRYPTED,"
-        "TAPE_POOL.SUPPLY,"
-        "TAPE_POOL.USER_COMMENT,"
-        "TAPE_POOL.CREATION_LOG_USER_NAME,"
-        "TAPE_POOL.CREATION_LOG_HOST_NAME,"
-        "TAPE_POOL.CREATION_LOG_TIME,"
-        "TAPE_POOL.LAST_UPDATE_USER_NAME,"
-        "TAPE_POOL.LAST_UPDATE_HOST_NAME,"
-        "TAPE_POOL.LAST_UPDATE_TIME "
-      "ORDER BY "
-        "TAPE_POOL_NAME";
+        "TAPE.MEDIA_TYPE_ID = MEDIA_TYPE.MEDIA_TYPE_ID";
+
+    if (searchCriteria.name || searchCriteria.vo || searchCriteria.encrypted) {
+      sql += " WHERE ";
+    }
+    bool addedAWhereConstraint = false;
+    if (searchCriteria.name) {
+      sql += "TAPE_POOL.TAPE_POOL_NAME = :NAME";
+      addedAWhereConstraint = true;
+    }
+
+    if (searchCriteria.vo) {
+      if (addedAWhereConstraint) sql += " AND ";
+      sql += "VIRTUAL_ORGANIZATION.VIRTUAL_ORGANIZATION_NAME = :VO";
+      addedAWhereConstraint = true;
+    }
+
+    if (searchCriteria.encrypted) {
+      if (addedAWhereConstraint) sql += " AND ";
+      sql += "TAPE_POOL.IS_ENCRYPTED = :ENCRYPTED";
+    }
+
+    sql +=
+        " GROUP BY "
+           "TAPE_POOL.TAPE_POOL_NAME,"
+           "VIRTUAL_ORGANIZATION.VIRTUAL_ORGANIZATION_NAME,"
+           "TAPE_POOL.NB_PARTIAL_TAPES,"
+           "TAPE_POOL.IS_ENCRYPTED,"
+           "TAPE_POOL.SUPPLY,"
+           "TAPE_POOL.USER_COMMENT,"
+           "TAPE_POOL.CREATION_LOG_USER_NAME,"
+           "TAPE_POOL.CREATION_LOG_HOST_NAME,"
+           "TAPE_POOL.CREATION_LOG_TIME,"
+           "TAPE_POOL.LAST_UPDATE_USER_NAME,"
+           "TAPE_POOL.LAST_UPDATE_HOST_NAME,"
+           "TAPE_POOL.LAST_UPDATE_TIME "
+         "ORDER BY "
+           "TAPE_POOL_NAME";
 
-    auto conn = m_connPool.getConn();
     auto stmt = conn.createStmt(sql);
     stmt.bindString(":STATE_DISABLED",common::dataStructures::Tape::stateToString(common::dataStructures::Tape::DISABLED));
     stmt.bindString(":STATE_ACTIVE",common::dataStructures::Tape::stateToString(common::dataStructures::Tape::ACTIVE));
+
+    if (searchCriteria.name) {
+      stmt.bindString(":NAME", searchCriteria.name.value());
+    }
+
+    if (searchCriteria.vo) {
+      stmt.bindString(":VO", searchCriteria.vo.value());
+    }
+
+    if(searchCriteria.encrypted) {
+      stmt.bindBool(":ENCRYPTED", searchCriteria.encrypted.value());
+    }
+
     auto rset = stmt.executeQuery();
     while (rset.next()) {
       TapePool pool;
@@ -3749,7 +3812,8 @@ std::list<common::dataStructures::Tape> RdbmsCatalogue::getTapes(rdbms::Conn &co
        searchCriteria.capacityInBytes ||
        searchCriteria.full ||
        searchCriteria.diskFileIds ||
-       searchCriteria.state) {
+       searchCriteria.state ||
+       searchCriteria.fromCastor) {
       sql += " WHERE";
     }
 
@@ -3813,7 +3877,12 @@ std::list<common::dataStructures::Tape> RdbmsCatalogue::getTapes(rdbms::Conn &co
       sql += " TAPE.TAPE_STATE = :TAPE_STATE";
       addedAWhereConstraint = true;
     }
-
+    if(searchCriteria.fromCastor) {
+      if(addedAWhereConstraint) sql += " AND ";
+      sql += " TAPE.IS_FROM_CASTOR = :FROM_CASTOR";
+      addedAWhereConstraint = true;
+    }
+    
     sql += " ORDER BY TAPE.VID";
 
     auto stmt = conn.createStmt(sql);
@@ -3826,6 +3895,7 @@ std::list<common::dataStructures::Tape> RdbmsCatalogue::getTapes(rdbms::Conn &co
     if(searchCriteria.vo) stmt.bindString(":VO", searchCriteria.vo.value());
     if(searchCriteria.capacityInBytes) stmt.bindUint64(":CAPACITY_IN_BYTES", searchCriteria.capacityInBytes.value());
     if(searchCriteria.full) stmt.bindBool(":IS_FULL", searchCriteria.full.value());
+    if(searchCriteria.fromCastor) stmt.bindBool(":FROM_CASTOR", searchCriteria.fromCastor.value());
     try{
       if(searchCriteria.state) stmt.bindString(":TAPE_STATE",cta::common::dataStructures::Tape::stateToString(searchCriteria.state.value()));
     } catch(cta::exception::Exception &ex){
@@ -5471,7 +5541,7 @@ void RdbmsCatalogue::createRequesterGroupMountRule(
 //------------------------------------------------------------------------------
 // getCachedRequesterGroupMountPolicy
 //------------------------------------------------------------------------------
-optional<common::dataStructures::MountPolicy> RdbmsCatalogue::getCachedRequesterGroupMountPolicy(const Group &group)
+ValueAndTimeBasedCacheInfo<optional<common::dataStructures::MountPolicy> > RdbmsCatalogue::getCachedRequesterGroupMountPolicy(const Group &group)
   const {
   try {
     auto getNonCachedValue = [&] {
@@ -5697,7 +5767,7 @@ bool RdbmsCatalogue::requesterMountRuleExists(rdbms::Conn &conn, const std::stri
 //------------------------------------------------------------------------------
 // getCachedRequesterMountPolicy
 //------------------------------------------------------------------------------
-optional<common::dataStructures::MountPolicy> RdbmsCatalogue::getCachedRequesterMountPolicy(const User &user) const {
+ValueAndTimeBasedCacheInfo <optional <common::dataStructures::MountPolicy> > RdbmsCatalogue::getCachedRequesterMountPolicy(const User &user) const {
   try {
     auto getNonCachedValue = [&] {
       auto conn = m_connPool.getConn();
@@ -5925,7 +5995,7 @@ std::list<common::dataStructures::MountPolicy> RdbmsCatalogue::getCachedMountPol
       auto conn = m_connPool.getConn();
       return getMountPolicies(conn);
     };
-    return m_allMountPoliciesCache.getCachedValue("all",getNonCachedValue);
+    return m_allMountPoliciesCache.getCachedValue("all",getNonCachedValue).value;
   } catch(exception::UserError &) {
     throw;
   } catch(exception::Exception &ex) {
@@ -7308,17 +7378,24 @@ uint64_t RdbmsCatalogue::checkAndGetNextArchiveFileId(const std::string &diskIns
       throw ue;
     }
 
-    auto mountPolicy = getCachedRequesterMountPolicy(User(diskInstanceName, user.name));
+    const auto userMountPolicyAndCacheInfo = getCachedRequesterMountPolicy(User(diskInstanceName, user.name));
+    const auto userMountPolicy = userMountPolicyAndCacheInfo.value;
     // Only consider the requester's group if there is no user mount policy
-    if(!mountPolicy) {
-      const auto groupMountPolicy = getCachedRequesterGroupMountPolicy(Group(diskInstanceName, user.group));
+    if(!userMountPolicy) {
+      const auto groupMountPolicyAndCacheInfo = getCachedRequesterGroupMountPolicy(Group(diskInstanceName, user.group));
+      const auto groupMountPolicy = groupMountPolicyAndCacheInfo.value;
 
       if(!groupMountPolicy) {
-        exception::UserError ue;
-        ue.getMessage() << "No mount rules for the requester or their group:"
-          " storageClass=" << storageClassName << " requester=" << diskInstanceName << ":" << user.name << ":" <<
-          user.group;
-        throw ue;
+
+        const auto defaultUserMountPolicyAndCacheInfo = getCachedRequesterMountPolicy(User(diskInstanceName, "default"));
+        const auto defaultUserMountPolicy = defaultUserMountPolicyAndCacheInfo.value;
+
+        if(!defaultUserMountPolicy) {
+          exception::UserErrorWithCacheInfo ue(defaultUserMountPolicyAndCacheInfo.cacheInfo);
+          ue.getMessage() << "Failed to check and get next archive file ID: No mount rules: storageClass=" <<
+            storageClassName << " requester=" << diskInstanceName << ":" << user.name << ":" << user.group;
+          throw ue;
+        }
       }
     }
 
@@ -7328,6 +7405,13 @@ uint64_t RdbmsCatalogue::checkAndGetNextArchiveFileId(const std::string &diskIns
       auto conn = m_connPool.getConn();
       return getNextArchiveFileId(conn);
     }
+  } catch(exception::UserErrorWithCacheInfo &ue) {
+    log::LogContext lc(m_log);
+    log::ScopedParamContainer spc(lc);
+    spc.add("cacheInfo", ue.cacheInfo)
+       .add("userError", ue.getMessage().str());
+    lc.log(log::INFO, "Catalogue::checkAndGetNextArchiveFileId caught a UserErrorWithCacheInfo");
+    throw;
   } catch(exception::UserError &) {
     throw;
   } catch(exception::Exception &ex) {
@@ -7362,19 +7446,31 @@ common::dataStructures::ArchiveFileQueueCriteria RdbmsCatalogue::getArchiveFileQ
     }
 
     // Get the mount policy - user mount policies overrule group ones
-    auto mountPolicy = getCachedRequesterMountPolicy(User(diskInstanceName, user.name));
-    if(!mountPolicy) {
-      mountPolicy = getCachedRequesterGroupMountPolicy(Group(diskInstanceName, user.group));
+    const auto userMountPolicyAndCacheInfo = getCachedRequesterMountPolicy(User(diskInstanceName, user.name));
+    const auto userMountPolicy = userMountPolicyAndCacheInfo.value;
 
-      if(!mountPolicy) {
-        exception::UserError ue;
-        ue.getMessage() << "No mount rules for the requester or their group: storageClass=" << storageClassName <<
-          " requester=" << diskInstanceName << ":" << user.name << ":" << user.group;
-        throw ue;
+    if(userMountPolicy) {
+      return common::dataStructures::ArchiveFileQueueCriteria(copyToPoolMap, *userMountPolicy);
+    } else {
+      const auto groupMountPolicyAndCacheInfo = getCachedRequesterGroupMountPolicy(Group(diskInstanceName, user.group));
+      const auto groupMountPolicy = groupMountPolicyAndCacheInfo.value;
+
+      if(groupMountPolicy) {
+        return common::dataStructures::ArchiveFileQueueCriteria(copyToPoolMap, *groupMountPolicy);
+      } else {
+        const auto defaultUserMountPolicyAndCacheInfo = getCachedRequesterMountPolicy(User(diskInstanceName, "default"));
+        const auto defaultUserMountPolicy = defaultUserMountPolicyAndCacheInfo.value;
+
+        if(defaultUserMountPolicy) {
+          return common::dataStructures::ArchiveFileQueueCriteria(copyToPoolMap, *defaultUserMountPolicy);
+        } else {
+          exception::UserErrorWithCacheInfo ue(defaultUserMountPolicyAndCacheInfo.cacheInfo);
+          ue.getMessage() << "Failed to get archive file queue criteria: No mount rules: storageClass=" <<
+            storageClassName << " requester=" << diskInstanceName << ":" << user.name << ":" << user.group;
+          throw ue;
+        }
       }
     }
-
-    return common::dataStructures::ArchiveFileQueueCriteria(copyToPoolMap, *mountPolicy);
   } catch(exception::UserError &) {
     throw;
   } catch(exception::Exception &ex) {
@@ -7393,7 +7489,7 @@ common::dataStructures::TapeCopyToPoolMap RdbmsCatalogue::getCachedTapeCopyToPoo
       auto conn = m_connPool.getConn();
       return getTapeCopyToPoolMap(conn, storageClass);
     };
-    return m_tapeCopyToPoolCache.getCachedValue(storageClass, getNonCachedValue);
+    return m_tapeCopyToPoolCache.getCachedValue(storageClass, getNonCachedValue).value;
   } catch(exception::UserError &) {
     throw;
   } catch(exception::Exception &ex) {
@@ -7448,7 +7544,7 @@ uint64_t RdbmsCatalogue::getCachedExpectedNbArchiveRoutes(const StorageClass &st
       auto conn = m_connPool.getConn();
       return getExpectedNbArchiveRoutes(conn, storageClass);
     };
-    return m_expectedNbArchiveRoutesCache.getCachedValue(storageClass, getNonCachedValue);
+    return m_expectedNbArchiveRoutesCache.getCachedValue(storageClass, getNonCachedValue).value;
   } catch (exception::LostDatabaseConnection &le) {
     throw exception::LostDatabaseConnection(std::string(__FUNCTION__) + " failed: " + le.getMessage().str());
   } catch(exception::UserError &) {
@@ -7718,7 +7814,7 @@ bool RdbmsCatalogue::isCachedAdmin(const common::dataStructures::SecurityIdentit
     auto getNonCachedValue = [&] {
       return isNonCachedAdmin(admin);
     };
-    return m_isAdminCache.getCachedValue(admin, getNonCachedValue);
+    return m_isAdminCache.getCachedValue(admin, getNonCachedValue).value;
   } catch(exception::UserError &) {
     throw;
   } catch(exception::Exception &ex) {
@@ -8089,7 +8185,7 @@ RdbmsCatalogue::getCachedActivitiesWeights(const std::string& diskInstance) cons
       auto conn = m_connPool.getConn();
       return getActivitiesWeights(conn, diskInstance);
     };
-    return m_activitiesFairShareWeights.getCachedValue(diskInstance, getNonCachedValue);
+    return m_activitiesFairShareWeights.getCachedValue(diskInstance, getNonCachedValue).value;
   } catch(exception::UserError &) {
     throw;
   } catch(exception::Exception &ex) {
diff --git a/catalogue/RdbmsCatalogue.hpp b/catalogue/RdbmsCatalogue.hpp
index 3f1f5190b3ad7d027628412b795f517aee61ac7a..bc49ae9dd0736f36c3eed96c797dd620e29ad3e6 100644
--- a/catalogue/RdbmsCatalogue.hpp
+++ b/catalogue/RdbmsCatalogue.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -117,6 +117,7 @@ public:
    * used by the Catalogue to determine the mount policy to be used when
    * archiving the file.
    * @return The new archive file identifier.
+   * @throw UserErrorWithTimeBasedCacheInfo if there was a user error.
    */
   uint64_t checkAndGetNextArchiveFileId(
     const std::string &diskInstanceName,
@@ -431,7 +432,9 @@ public:
 
   void createTapePool(const common::dataStructures::SecurityIdentity &admin, const std::string &name, const std::string &vo, const uint64_t nbPartialTapes, const bool encryptionValue, const cta::optional<std::string> &supply, const std::string &comment) override;
   void deleteTapePool(const std::string &name) override;
-  std::list<TapePool> getTapePools() const override;
+  std::list<TapePool> getTapePools(const TapePoolSearchCriteria &searchCriteria) const override;
+
+  std::list<TapePool> getTapePools(rdbms::Conn &conn, const TapePoolSearchCriteria &searchCriteria) const;
 
   /**
    * @return The tape pool with the specified name.
@@ -1228,8 +1231,9 @@ protected:
    * @param user The fully qualified user, in other words the name of the disk
    * instance and the name of the group.
    * @return The mount policy or nullopt if one does not exists.
+   * @throw UserErrorWithTimeBasedCacheInfo if there was a user error.
    */
-  optional<common::dataStructures::MountPolicy> getCachedRequesterMountPolicy(const User &user) const;
+  ValueAndTimeBasedCacheInfo<optional<common::dataStructures::MountPolicy> > getCachedRequesterMountPolicy(const User &user) const;
 
   /**
    * Returns the specified requester mount-policy or nullopt if one does not
@@ -1303,7 +1307,7 @@ protected:
    * instance and the name of the group.
    * @return The cached mount policy or nullopt if one does not exists.
    */
-  optional<common::dataStructures::MountPolicy> getCachedRequesterGroupMountPolicy(const Group &group) const;
+  ValueAndTimeBasedCacheInfo<optional<common::dataStructures::MountPolicy> > getCachedRequesterGroupMountPolicy(const Group &group) const;
 
   /**
    * Returns the specified requester-group mount-policy or nullptr if one does
diff --git a/catalogue/RdbmsCatalogueGetArchiveFilesForRepackItor.cpp b/catalogue/RdbmsCatalogueGetArchiveFilesForRepackItor.cpp
index 36bff5fd74d333257e16e1c5a056c7dda538d276..310ad0394e584d8c72cded9567a493ee1c36a65f 100644
--- a/catalogue/RdbmsCatalogueGetArchiveFilesForRepackItor.cpp
+++ b/catalogue/RdbmsCatalogueGetArchiveFilesForRepackItor.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/RdbmsCatalogueGetArchiveFilesForRepackItor.hpp b/catalogue/RdbmsCatalogueGetArchiveFilesForRepackItor.hpp
index cac6b5f7a668eefa1c8f8043155d855f175c2381..e464c1045e35d403ce15a4a81ee36306c6e1c7b8 100644
--- a/catalogue/RdbmsCatalogueGetArchiveFilesForRepackItor.hpp
+++ b/catalogue/RdbmsCatalogueGetArchiveFilesForRepackItor.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/RdbmsCatalogueGetArchiveFilesItor.cpp b/catalogue/RdbmsCatalogueGetArchiveFilesItor.cpp
index 82c39e1fe03d46c343a05eed5e573d402be68629..bef739104e2ebef88b109dd4426c7a32ad8a1acd 100644
--- a/catalogue/RdbmsCatalogueGetArchiveFilesItor.cpp
+++ b/catalogue/RdbmsCatalogueGetArchiveFilesItor.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/RdbmsCatalogueGetArchiveFilesItor.hpp b/catalogue/RdbmsCatalogueGetArchiveFilesItor.hpp
index a38d93885be3a59bb135974955db37a00fea0120..05a7d0201f2e42d5ad3fbfc2534a0ef2883e0bff 100644
--- a/catalogue/RdbmsCatalogueGetArchiveFilesItor.hpp
+++ b/catalogue/RdbmsCatalogueGetArchiveFilesItor.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/RdbmsCatalogueGetFileRecycleLogItor.cpp b/catalogue/RdbmsCatalogueGetFileRecycleLogItor.cpp
index f969fe59d8ddc178788b71b40941110c77c224e4..ab9b81519cea0155e55f7bf0bcd6bd876141e2eb 100644
--- a/catalogue/RdbmsCatalogueGetFileRecycleLogItor.cpp
+++ b/catalogue/RdbmsCatalogueGetFileRecycleLogItor.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/RdbmsCatalogueGetFileRecycleLogItor.hpp b/catalogue/RdbmsCatalogueGetFileRecycleLogItor.hpp
index ba5ab34f230b19aabd695575453c564c08ae1094..c94cfe3949fa916190a23e0c55ca9ff4e01f993a 100644
--- a/catalogue/RdbmsCatalogueGetFileRecycleLogItor.hpp
+++ b/catalogue/RdbmsCatalogueGetFileRecycleLogItor.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/RdbmsCatalogueTapeContentsItor.cpp b/catalogue/RdbmsCatalogueTapeContentsItor.cpp
index eb9f9cbccc6030542cb7e6fa9387f2e2fb9fd5df..5b28689098d3fc56c363f7a48efa298c51fd48eb 100644
--- a/catalogue/RdbmsCatalogueTapeContentsItor.cpp
+++ b/catalogue/RdbmsCatalogueTapeContentsItor.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/RdbmsCatalogueTapeContentsItor.hpp b/catalogue/RdbmsCatalogueTapeContentsItor.hpp
index d334f984e93f87f4d16885b64e6ef9a5e5b85792..8a95009d6d12f9a36abc26806e9f89deb30663cb 100644
--- a/catalogue/RdbmsCatalogueTapeContentsItor.hpp
+++ b/catalogue/RdbmsCatalogueTapeContentsItor.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/RecyleTapeFileSearchCriteria.hpp b/catalogue/RecyleTapeFileSearchCriteria.hpp
index 8d1ccd1e0337d89aafb12611a439892b51ac5372..8fc49830645e51f08c5c95006a235c8491ff22a3 100644
--- a/catalogue/RecyleTapeFileSearchCriteria.hpp
+++ b/catalogue/RecyleTapeFileSearchCriteria.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/RequesterAndGroupMountPolicies.hpp b/catalogue/RequesterAndGroupMountPolicies.hpp
index 504e05e017603bbe1d3d24b9397c2b1b6334099e..49a2cb0c7382bf04c0cf0bd39bc3666c241ab772 100644
--- a/catalogue/RequesterAndGroupMountPolicies.hpp
+++ b/catalogue/RequesterAndGroupMountPolicies.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SQLiteSchemaComparer.cpp b/catalogue/SQLiteSchemaComparer.cpp
index 20bd5a100f75d203c267c17ee1eb4b1f66065501..bd89e9215a423cdd7cb29f02bf4d70d7b5e1536d 100644
--- a/catalogue/SQLiteSchemaComparer.cpp
+++ b/catalogue/SQLiteSchemaComparer.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SQLiteSchemaComparer.hpp b/catalogue/SQLiteSchemaComparer.hpp
index 100abbff6a3337ae1958413d6ec04e0eddfcacb8..437b988ee5602927f114371033b02388eafa09de 100644
--- a/catalogue/SQLiteSchemaComparer.hpp
+++ b/catalogue/SQLiteSchemaComparer.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SQLiteSchemaInserter.cpp b/catalogue/SQLiteSchemaInserter.cpp
index d9ea5375423928d6b2617b1a96ff478a06fbd1b7..b6b17686c9c9bc61d6b4ae8ea3a218b40a391c1b 100644
--- a/catalogue/SQLiteSchemaInserter.cpp
+++ b/catalogue/SQLiteSchemaInserter.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SQLiteSchemaInserter.hpp b/catalogue/SQLiteSchemaInserter.hpp
index 72296d6d221653e73dbb042ea0dcb30ef2cb57fe..98c68278969d0c44039651618dec745005854fe7 100644
--- a/catalogue/SQLiteSchemaInserter.hpp
+++ b/catalogue/SQLiteSchemaInserter.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SchemaChecker.cpp b/catalogue/SchemaChecker.cpp
index 77ef2a44cf5c8e5ac07e9d4cc4f34ec0e6a68ddd..f5bf46ae15cb98080340a50715b252c680e33d8e 100644
--- a/catalogue/SchemaChecker.cpp
+++ b/catalogue/SchemaChecker.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SchemaChecker.hpp b/catalogue/SchemaChecker.hpp
index 97db8965fcfa80e2d5fe89ef30e1fcc11e90a12d..144038fe8cb07c7b352d1a702b4d373e32dc466e 100644
--- a/catalogue/SchemaChecker.hpp
+++ b/catalogue/SchemaChecker.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SchemaCheckerResult.cpp b/catalogue/SchemaCheckerResult.cpp
index 46cfad4e5cff535d306cf80bbc9a25a64229c3bb..50b5883cff9ccb3649b1928aae03358da3e16674 100644
--- a/catalogue/SchemaCheckerResult.cpp
+++ b/catalogue/SchemaCheckerResult.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SchemaCheckerResult.hpp b/catalogue/SchemaCheckerResult.hpp
index 88e9ba64a585476e5621e3788ad02f989b8f0c67..775701783c4ba01001810509ab16f09aaa5b4c0b 100644
--- a/catalogue/SchemaCheckerResult.hpp
+++ b/catalogue/SchemaCheckerResult.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SchemaComparer.cpp b/catalogue/SchemaComparer.cpp
index f3fd613331aa85c43da4a84926fea0020ad13481..874a503a1efda0cb806669ceebd2e44bea604421 100644
--- a/catalogue/SchemaComparer.cpp
+++ b/catalogue/SchemaComparer.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SchemaComparer.hpp b/catalogue/SchemaComparer.hpp
index fda25d0365b812a557420c7224337375699a5c91..1f1e47ed083ab143502b35fe46ca4237b00854e2 100644
--- a/catalogue/SchemaComparer.hpp
+++ b/catalogue/SchemaComparer.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SchemaCreatingSqliteCatalogue.cpp b/catalogue/SchemaCreatingSqliteCatalogue.cpp
index 1c61a64aabccd89f4bc139e7691b9eb2611b44b1..35ea295b1b387501584c02087e9af84873adf968 100644
--- a/catalogue/SchemaCreatingSqliteCatalogue.cpp
+++ b/catalogue/SchemaCreatingSqliteCatalogue.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SchemaCreatingSqliteCatalogue.hpp b/catalogue/SchemaCreatingSqliteCatalogue.hpp
index aca85dd3c5b9b295776fcba0be76d3181493725c..b34156c8799403265db580eb7d753d992409fdc0 100644
--- a/catalogue/SchemaCreatingSqliteCatalogue.hpp
+++ b/catalogue/SchemaCreatingSqliteCatalogue.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SchemaSqlStatementsReader.cpp b/catalogue/SchemaSqlStatementsReader.cpp
index 41b76d9770f035a31e1734ed9cf63a84db24c14a..3aa34481dec1fa66cd674c1d6d97ff10a97cdc25 100644
--- a/catalogue/SchemaSqlStatementsReader.cpp
+++ b/catalogue/SchemaSqlStatementsReader.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SchemaSqlStatementsReader.hpp b/catalogue/SchemaSqlStatementsReader.hpp
index b191e1019332c47567b31a11b391fb8a60e848c5..c5318574edc201e9df4f6b7fcb6f73e79b7b6a62 100644
--- a/catalogue/SchemaSqlStatementsReader.hpp
+++ b/catalogue/SchemaSqlStatementsReader.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SchemaVersion.cpp b/catalogue/SchemaVersion.cpp
index 74c61d0f35bb55721078891f7262dc24c25c2245..a80b1241e36cdfde1d7dbfc0a453d44a00a9ac60 100644
--- a/catalogue/SchemaVersion.cpp
+++ b/catalogue/SchemaVersion.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SchemaVersion.hpp b/catalogue/SchemaVersion.hpp
index 13eb470b3f324eff8c73300c3167aa95c126718b..8600bf72cd522bb0429ca7086f79209a7844510d 100644
--- a/catalogue/SchemaVersion.hpp
+++ b/catalogue/SchemaVersion.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SetProductionCmd.cpp b/catalogue/SetProductionCmd.cpp
index 40b8aaa58eec6b9c85b18d0a8bce41b6c0896106..f62a63a30483e71685d28860e7079dc533f06a24 100644
--- a/catalogue/SetProductionCmd.cpp
+++ b/catalogue/SetProductionCmd.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SetProductionCmd.hpp b/catalogue/SetProductionCmd.hpp
index 6fdb72c8b2d71b04b382d8ab3477b4fabfc2740c..58b913631ee68c325ba60e2ba35ad0ef6c29c127 100644
--- a/catalogue/SetProductionCmd.hpp
+++ b/catalogue/SetProductionCmd.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SetProductionCmdLineArgs.cpp b/catalogue/SetProductionCmdLineArgs.cpp
index c7884265aff58524720ba6b40a80def5469a7b6e..54beaa67aec3ff31426120087581bcf653101914 100644
--- a/catalogue/SetProductionCmdLineArgs.cpp
+++ b/catalogue/SetProductionCmdLineArgs.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SetProductionCmdLineArgs.hpp b/catalogue/SetProductionCmdLineArgs.hpp
index 8c1e17a0e1118d12af40737c17cc74bba6194a5f..9830e290f4f687c0d2ce5a226cab3055944a9926 100644
--- a/catalogue/SetProductionCmdLineArgs.hpp
+++ b/catalogue/SetProductionCmdLineArgs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SetProductionCmdMain.cpp b/catalogue/SetProductionCmdMain.cpp
index 297ca884ea3390855b5c3d27e8334485d5b5654f..38d6d2206583d5d7ec1d7c3fd380fa17058d006e 100644
--- a/catalogue/SetProductionCmdMain.cpp
+++ b/catalogue/SetProductionCmdMain.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SqliteCatalogue.cpp b/catalogue/SqliteCatalogue.cpp
index 9476cf6c166e3ea20d06f5e7e0ef7ee2f98e3c7f..c809025876f84e27a19ee67f5141488b3046009c 100644
--- a/catalogue/SqliteCatalogue.cpp
+++ b/catalogue/SqliteCatalogue.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SqliteCatalogue.hpp b/catalogue/SqliteCatalogue.hpp
index a3bf3e194dff7db7073a77b8acbf53ea746bfcb1..020589f930823f08d39bd77e288d0a703a3a11a6 100644
--- a/catalogue/SqliteCatalogue.hpp
+++ b/catalogue/SqliteCatalogue.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SqliteCatalogueSchema.before_SQL.cpp b/catalogue/SqliteCatalogueSchema.before_SQL.cpp
index a658312924398bb709f5f23ad1a3cfd1deaccbe0..b6ed05d35ab438f765a06cf880756de87f6584e3 100644
--- a/catalogue/SqliteCatalogueSchema.before_SQL.cpp
+++ b/catalogue/SqliteCatalogueSchema.before_SQL.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/SqliteCatalogueSchema.hpp b/catalogue/SqliteCatalogueSchema.hpp
index 4210a1ff374b95062d9c7d337a00df8aa0522894..16e46a5ce46430adbebf884cbb687ca4beb87bb2 100644
--- a/catalogue/SqliteCatalogueSchema.hpp
+++ b/catalogue/SqliteCatalogueSchema.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/TapeFileSearchCriteria.hpp b/catalogue/TapeFileSearchCriteria.hpp
index 77b1ecb5f89b1a8ce65f2214ebe8269fd366300d..df604f20d1fff7f9f1c94e94da2ab5679cd3d339 100644
--- a/catalogue/TapeFileSearchCriteria.hpp
+++ b/catalogue/TapeFileSearchCriteria.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/TapeFileWritten.cpp b/catalogue/TapeFileWritten.cpp
index 9456c9c8df84adaa4eb402d84bc5a0b82e8b3626..0b8e367ea0fa2ca969d6bb645e1422886f369159 100644
--- a/catalogue/TapeFileWritten.cpp
+++ b/catalogue/TapeFileWritten.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/TapeFileWritten.hpp b/catalogue/TapeFileWritten.hpp
index 9670b62b6800ed7fbfebcbe88e269116aa6dfdf9..6dba1d6867b48aaf9420b01f0d66f23785110e50 100644
--- a/catalogue/TapeFileWritten.hpp
+++ b/catalogue/TapeFileWritten.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/TapeForWriting.cpp b/catalogue/TapeForWriting.cpp
index 45c1bce7b2d5393e081187d6f54dccc72cd599e0..e361b62f2dd33e51f8106edbc6dbc7ef90fb426f 100644
--- a/catalogue/TapeForWriting.cpp
+++ b/catalogue/TapeForWriting.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/TapeForWriting.hpp b/catalogue/TapeForWriting.hpp
index 62ae1021834b75d16db386f104712d4aa6449a97..2f2075b0182451a94f80476558bc5109d091663a 100644
--- a/catalogue/TapeForWriting.hpp
+++ b/catalogue/TapeForWriting.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/TapeItemImplementation.cpp b/catalogue/TapeItemImplementation.cpp
index 7d568ac797623f75faaebef9b9e4b5a5a5536fc8..59f69d84b143bb180e18123b0debeb8c63a77c60 100644
--- a/catalogue/TapeItemImplementation.cpp
+++ b/catalogue/TapeItemImplementation.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/TapeItemWritten.hpp b/catalogue/TapeItemWritten.hpp
index 8731a980fc8728b4b54ce00db61d0588ee99e5b5..f98265385f7f7c5b52d8b666a9f8bd78d3ffa786 100644
--- a/catalogue/TapeItemWritten.hpp
+++ b/catalogue/TapeItemWritten.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/TapeItemWrittenPointer.hpp b/catalogue/TapeItemWrittenPointer.hpp
index 3f996fa6cd3dbe326fd74f4800cc7521ca1f2dea..1158c35e2ad7fea643ed5828c01e32dae062fc71 100644
--- a/catalogue/TapeItemWrittenPointer.hpp
+++ b/catalogue/TapeItemWrittenPointer.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/TapeItemWrittenPointerTest.cpp b/catalogue/TapeItemWrittenPointerTest.cpp
index ee79a0953aefa747e0a4aad04a091b3a98afcddf..97704b31acc32bad1c1e3621acd6f3754d2bfa79 100644
--- a/catalogue/TapeItemWrittenPointerTest.cpp
+++ b/catalogue/TapeItemWrittenPointerTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/TapePool.cpp b/catalogue/TapePool.cpp
index 0a65ca72e0eeda6fcc642e838f52e8e9d22c4cef..5a20d5b71529d79358895739f8e5d8d6065d692b 100644
--- a/catalogue/TapePool.cpp
+++ b/catalogue/TapePool.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/TapePool.hpp b/catalogue/TapePool.hpp
index c147f68ef6be675af22e1af7ade99768696caf9c..24b778ef0ff014c7ac571b732ecf227fc00d8c0f 100644
--- a/catalogue/TapePool.hpp
+++ b/catalogue/TapePool.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/TapePoolSearchCriteria.hpp b/catalogue/TapePoolSearchCriteria.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..6e38265cd1f1918b33988e48207a8ede577491c6
--- /dev/null
+++ b/catalogue/TapePoolSearchCriteria.hpp
@@ -0,0 +1,57 @@
+/*
+ * @project        The CERN Tape Archive (CTA)
+ * @copyright      Copyright(C) 2015-2021 CERN
+ * @license        This program is free software: you can redistribute it and/or modify
+ *                 it under the terms of the GNU General Public License as published by
+ *                 the Free Software Foundation, either version 3 of the License, or
+ *                 (at your option) any later version.
+ *
+ *                 This program is distributed in the hope that it will be useful,
+ *                 but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *                 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *                 GNU General Public License for more details.
+ *
+ *                 You should have received a copy of the GNU General Public License
+ *                 along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include <common/optional.hpp>
+
+namespace cta {
+namespace catalogue {
+
+/**
+ * The collection of criteria used to select a set of tapepools.
+ *
+ * A tapepool is selected if it meets all of the specified criteria.
+ *
+ * A criterion is only considered specified if it has been set.
+ *
+ * Please note that no wild cards, for example '*' or '%', are supported.
+ */
+struct TapePoolSearchCriteria {
+
+   /**
+   * The name of the tapepool.
+   */
+    optional<std::string> name;
+
+    /**
+    * The virtual organization of the tapepool.
+    */
+    optional<std::string> vo;
+
+    /**
+    * Set to true if searching for encrypted tape pools.
+    */
+    optional<bool> encrypted;
+
+}; // struct TapePoolSearchCriteria
+
+} // namespace catalogue
+} // namespace cta
\ No newline at end of file
diff --git a/catalogue/TapeSearchCriteria.hpp b/catalogue/TapeSearchCriteria.hpp
index 4785c9b0192d32fd03b2bb56bdd1dd7262519052..1deb8a51082a434478f53d2ba5de6997ce58358a 100644
--- a/catalogue/TapeSearchCriteria.hpp
+++ b/catalogue/TapeSearchCriteria.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -76,6 +76,11 @@ struct TapeSearchCriteria {
    */
   optional<bool> full;
 
+  /**
+   * Set to true if searching for tapes imported from castor.
+   */
+  optional<bool> fromCastor;
+
   /**
    * List of disk file IDs to search for.
    */
diff --git a/catalogue/TimeBasedCache.hpp b/catalogue/TimeBasedCache.hpp
index 47c85e3db3e21a0c233b0b430d2da76d27b448e6..437cd38708108e6f69bad5353a4462d42fc6d050 100644
--- a/catalogue/TimeBasedCache.hpp
+++ b/catalogue/TimeBasedCache.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -17,6 +17,7 @@
 
 #pragma once
 
+#include "catalogue/ValueAndTimeBasedCacheInfo.hpp"
 #include "common/make_unique.hpp"
 #include "common/threading/Mutex.hpp"
 #include "common/threading/MutexLocker.hpp"
@@ -40,11 +41,11 @@ public:
   }
 
   /**
-   * Get the cached value corresponing to the specified key.
+   * Get the cached value corresponding to the specified key.
    *
    * This method updates the cache when necessary.
    */
-  template<typename Callable> Value getCachedValue(const Key &key, const Callable &getNonCachedValue) {
+  template<typename Callable> ValueAndTimeBasedCacheInfo<Value> getCachedValue(const Key &key, const Callable &getNonCachedValue) {
     const time_t now = time(nullptr);
 
     threading::MutexLocker cacheLock(m_mutex);
@@ -56,16 +57,17 @@ public:
       const time_t ageSecs = now - cachedValue.timestamp;
 
       if (m_maxAgeSecs >= ageSecs) { // Cached value is fresh
-        return cachedValue.value;
+        return ValueAndTimeBasedCacheInfo<Value>(cachedValue.value, "Fresh value found in cache");
       } else { // Cached value is stale
         cachedValue.value = getNonCachedValue();
         cachedValue.timestamp = ::time(nullptr);
-        return cachedValue.value;
+
+        return ValueAndTimeBasedCacheInfo<Value>(cachedValue.value, "Stale value found and replaced in cache");
       }
     } else { // No cache hit
       const auto emplaceResult = m_cache.emplace(std::make_pair(key,
         cta::make_unique<TimestampedValue>(now, getNonCachedValue())));
-      return emplaceResult.first->second->value;
+      return ValueAndTimeBasedCacheInfo<Value>(emplaceResult.first->second->value, "First time value entered into cache");
     }
   }
 
diff --git a/catalogue/ValueAndTimeBasedCacheInfo.hpp b/catalogue/ValueAndTimeBasedCacheInfo.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..bc3680d13cff9856460d9eefbfd00914aea5a651
--- /dev/null
+++ b/catalogue/ValueAndTimeBasedCacheInfo.hpp
@@ -0,0 +1,36 @@
+/*
+ * @project        The CERN Tape Archive (CTA)
+ * @copyright      Copyright(C) 2015-2021 CERN
+ * @license        This program is free software: you can redistribute it and/or modify
+ *                 it under the terms of the GNU General Public License as published by
+ *                 the Free Software Foundation, either version 3 of the License, or
+ *                 (at your option) any later version.
+ *
+ *                 This program is distributed in the hope that it will be useful,
+ *                 but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *                 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *                 GNU General Public License for more details.
+ *
+ *                 You should have received a copy of the GNU General Public License
+ *                 along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <string>
+#include <time.h>
+
+namespace cta {
+namespace catalogue {
+
+template <typename Value> struct ValueAndTimeBasedCacheInfo {
+  Value value;
+  std::string cacheInfo;
+
+  ValueAndTimeBasedCacheInfo(const Value &v, const std::string &cInfo):
+    value(v), cacheInfo(cInfo) {
+  }
+}; // class ValueAndTimeBasedCacheInfo
+
+} // namespace catalogue
+} // namespace cta
diff --git a/catalogue/VerifySchemaCmd.cpp b/catalogue/VerifySchemaCmd.cpp
index baf9dc264524662c9058dbf4ad908320bf68c604..d1f3492715c0292d226331da16cfb727fa0cd025 100644
--- a/catalogue/VerifySchemaCmd.cpp
+++ b/catalogue/VerifySchemaCmd.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/VerifySchemaCmd.hpp b/catalogue/VerifySchemaCmd.hpp
index ff6ccdca0302573fe31f5cc13792afed2ac5947c..35ce9531651bd7585a303314eb33abe403563225 100644
--- a/catalogue/VerifySchemaCmd.hpp
+++ b/catalogue/VerifySchemaCmd.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/VerifySchemaCmdLineArgs.cpp b/catalogue/VerifySchemaCmdLineArgs.cpp
index 9b1930805f39e70cdd21b1c99b503ed9df293c60..acf407707127cc5392d40d185aeeb14ee19135fb 100644
--- a/catalogue/VerifySchemaCmdLineArgs.cpp
+++ b/catalogue/VerifySchemaCmdLineArgs.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/VerifySchemaCmdLineArgs.hpp b/catalogue/VerifySchemaCmdLineArgs.hpp
index 8815747695429bee6cc0b39f518e33c78162fd13..db3eef0749d9589375e3dbe06358d115beab02ee 100644
--- a/catalogue/VerifySchemaCmdLineArgs.hpp
+++ b/catalogue/VerifySchemaCmdLineArgs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/VerifySchemaCmdLineArgsTest.cpp b/catalogue/VerifySchemaCmdLineArgsTest.cpp
index e8cae0577551be45443197abd17d7b3cf319b7d6..22d40cb1cd44de0f028eea8377410ef5e1f3a2fa 100644
--- a/catalogue/VerifySchemaCmdLineArgsTest.cpp
+++ b/catalogue/VerifySchemaCmdLineArgsTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/VerifySchemaCmdMain.cpp b/catalogue/VerifySchemaCmdMain.cpp
index 9740afe532aea82e11ab2e05adf4ef14b7b666e2..89602a0e064c8ed1167649d4f66ccfce3b609c22 100644
--- a/catalogue/VerifySchemaCmdMain.cpp
+++ b/catalogue/VerifySchemaCmdMain.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/catalogue/retryOnLostConnection.hpp b/catalogue/retryOnLostConnection.hpp
index 96ddc10bd778cbc6d31b4421a30bf7090383b76d..48d5d28b28a9b469be7d773a5bf0d2776172851d 100644
--- a/catalogue/retryOnLostConnection.hpp
+++ b/catalogue/retryOnLostConnection.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/cmdline/CMakeLists.txt b/cmdline/CMakeLists.txt
index 55be6b280e41bb195153aff820de891a5d29c876..0feec77374d48d8c619719c2882440ade2dedb54 100644
--- a/cmdline/CMakeLists.txt
+++ b/cmdline/CMakeLists.txt
@@ -40,7 +40,7 @@ set_property (TARGET cta-admin APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
 #
 add_executable(cta-send-event CtaSendEvent.cpp)
 target_link_libraries(cta-send-event ctacommon XrdSsiPbEosCta XrdSsiLib XrdUtils)
-set_property (TARGET cta-send-event APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
+set_property(TARGET cta-send-event APPEND PROPERTY INSTALL_RPATH ${PROTOBUF3_RPATH})
 
 #
 # verify-file <archiveFileId> <vid>
@@ -65,4 +65,5 @@ install(TARGETS cta-admin DESTINATION usr/bin)
 install(FILES cta-admin.1cta DESTINATION usr/share/man/man1)
 install(TARGETS cta-send-event DESTINATION usr/bin)
 install(FILES cta-send-closew.sh DESTINATION usr/bin)
+install(TARGETS cta-verify-file DESTINATION usr/bin)
 install(FILES cta-cli.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/cta)
diff --git a/cmdline/CtaAdminCmd.cpp b/cmdline/CtaAdminCmd.cpp
index 14b62c04b91dbf07bd18b0618787f3fce37e6a61..334e55dc4ddb09edd295d03c4ed47977f66d947e 100644
--- a/cmdline/CtaAdminCmd.cpp
+++ b/cmdline/CtaAdminCmd.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/cmdline/CtaAdminCmd.hpp b/cmdline/CtaAdminCmd.hpp
index 525e08774b94c7c4a7b385cb83883af30ebee0fe..fa5bfee36f7be15aa64a1c59f455859a93381966 100644
--- a/cmdline/CtaAdminCmd.hpp
+++ b/cmdline/CtaAdminCmd.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/cmdline/CtaAdminCmdParse.cpp b/cmdline/CtaAdminCmdParse.cpp
index 8d1b444df5157437d6bac4c1a54e099ee6ddff4e..4106544c45c6d8207d1b9bc2b34337c3edf8b39c 100644
--- a/cmdline/CtaAdminCmdParse.cpp
+++ b/cmdline/CtaAdminCmdParse.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/cmdline/CtaAdminCmdParse.hpp b/cmdline/CtaAdminCmdParse.hpp
index ce853d1dae6ada5325caa415fe2282a22db0e9be..70b6123de3d2a67a453fdecac8e0321c38022608 100644
--- a/cmdline/CtaAdminCmdParse.hpp
+++ b/cmdline/CtaAdminCmdParse.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -252,6 +252,7 @@ const std::map<std::string, OptionBoolean::Key> boolOptions = {
    { "--encrypted",             OptionBoolean::ENCRYPTED },
    { "--force",                 OptionBoolean::FORCE },
    { "--full",                  OptionBoolean::FULL },
+   {"--fromcastor",             OptionBoolean::FROM_CASTOR },
 
    // hasOption options
    { "--disabledtape",          OptionBoolean::DISABLED },
@@ -297,7 +298,7 @@ const std::map<std::string, OptionUInt64::Key> uint64Options = {
  * Map string options to Protocol Buffer enum values
  */
 const std::map<std::string, OptionString::Key> strOptions = {
-   { "--bufferurl",             OptionString::BUFFERURL }, 
+   { "--bufferurl",             OptionString::BUFFERURL },
    { "--cartridge",             OptionString::CARTRIDGE },
    { "--comment",               OptionString::COMMENT },
    { "--drive",                 OptionString::DRIVE },
@@ -435,6 +436,7 @@ const Option opt_fidfile              { Option::OPT_STR_LIST, "--fxidfile",
 const Option opt_filename             { Option::OPT_STR,  "--file",                  "-f",   " <filename>" };
 const Option opt_force                { Option::OPT_BOOL, "--force",                 "-f",   " <\"true\" or \"false\">" };
 const Option opt_force_flag           { Option::OPT_FLAG, "--force",                 "-f",   "" };
+const Option opt_fromcastor           { Option::OPT_BOOL, "--fromcastor",            "-fc",  " <\"true\" or \"false\">"};      
 const Option opt_instance             { Option::OPT_STR,  "--instance",              "-i",   " <disk_instance>" };
 const Option opt_justarchive          { Option::OPT_FLAG, "--justarchive",           "-a",   "" };
 const Option opt_justmove             { Option::OPT_FLAG, "--justmove",              "-m",   "" };
@@ -578,7 +580,7 @@ const std::map<cmd_key_t, cmd_val_t> cmdOptions = {
    {{ AdminCmd::CMD_TAPE,                 AdminCmd::SUBCMD_LS    },
       { opt_vid.optional(), opt_mediatype.optional(), opt_vendor.optional(),
         opt_logicallibrary.optional(), opt_tapepool.optional(), opt_vo.optional(), opt_capacity.optional(),
-        opt_full.optional(), opt_fidfile.optional(), opt_all.optional(), opt_state.optional() }},
+        opt_full.optional(), opt_fidfile.optional(), opt_all.optional(), opt_state.optional(), opt_fromcastor.optional() }},
    {{ AdminCmd::CMD_TAPE,                 AdminCmd::SUBCMD_LABEL },
       { opt_vid, opt_force.optional() }},
    /*----------------------------------------------------------------------------------------------------*/
@@ -592,7 +594,7 @@ const std::map<cmd_key_t, cmd_val_t> cmdOptions = {
       { opt_tapepool_alias, opt_vo.optional(), opt_partialtapes.optional(), opt_encrypted.optional(),
         opt_supply.optional(), opt_comment.optional() }},
    {{ AdminCmd::CMD_TAPEPOOL,             AdminCmd::SUBCMD_RM    }, { opt_tapepool_alias }},
-   {{ AdminCmd::CMD_TAPEPOOL,             AdminCmd::SUBCMD_LS    }, { }},
+   {{ AdminCmd::CMD_TAPEPOOL,             AdminCmd::SUBCMD_LS    }, { opt_tapepool.optional(), opt_vo.optional(), opt_encrypted.optional()}},
    /*----------------------------------------------------------------------------------------------------*/
    {{ AdminCmd::CMD_DISKSYSTEM,           AdminCmd::SUBCMD_ADD   },
       { opt_disksystem, opt_file_regexp, opt_free_space_query_url, opt_refresh_interval, opt_targeted_free_space, opt_sleep_time,
diff --git a/cmdline/CtaAdminTextFormatter.cpp b/cmdline/CtaAdminTextFormatter.cpp
index 126be7e7a0bca6cb470c9fe174701e10ef8ec3ca..4083520fb6825c50b57d29ba6dbce118cbaa4fbf 100644
--- a/cmdline/CtaAdminTextFormatter.cpp
+++ b/cmdline/CtaAdminTextFormatter.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -614,6 +614,7 @@ void TextFormatter::printRepackLsHeader() {
     "repackTime",
     "c.user",
     "vid",
+    "tapepool",
     "providedFiles",
     "totalFiles",
     "totalBytes",
@@ -630,6 +631,7 @@ void TextFormatter::print(const RepackLsItem &rels_item) {
    secondsToDayHoursMinSec(rels_item.repack_time()),
    rels_item.creation_log().username(),
    rels_item.vid(),
+   rels_item.tapepool(),
    rels_item.user_provided_files(),
    rels_item.total_files_to_archive(), //https://gitlab.cern.ch/cta/CTA/-/issues/680#note_3849045
    dataSizeToStr(rels_item.total_bytes_to_archive()), //https://gitlab.cern.ch/cta/CTA/-/issues/680#note_3849045
diff --git a/cmdline/CtaAdminTextFormatter.hpp b/cmdline/CtaAdminTextFormatter.hpp
index 0d11f2538938acd3f211fee90255073f0dc049de..e3745d454cdf0cc7f3c2207609868b36d21f3f7d 100644
--- a/cmdline/CtaAdminTextFormatter.hpp
+++ b/cmdline/CtaAdminTextFormatter.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/cmdline/CtaCmdOptions.hpp b/cmdline/CtaCmdOptions.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..fffbbdb92c02c14c3c1705c59263bc33befa118c
--- /dev/null
+++ b/cmdline/CtaCmdOptions.hpp
@@ -0,0 +1,94 @@
+/*
+ * @project        The CERN Tape Archive (CTA)
+ * @copyright      Copyright(C) 2015-2021 CERN
+ * @license        This program is free software: you can redistribute it and/or modify
+ *                 it under the terms of the GNU General Public License as published by
+ *                 the Free Software Foundation, either version 3 of the License, or
+ *                 (at your option) any later version.
+ *
+ *                 This program is distributed in the hope that it will be useful,
+ *                 but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *                 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *                 GNU General Public License for more details.
+ *
+ *                 You should have received a copy of the GNU General Public License
+ *                 along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/*!
+* Simple command line option class for simpler commands like cta-verify-file or cta-send-event
+*/
+class StringOption {
+public:
+    /*!
+    * Constructor
+    */
+    StringOption(const std::string &long_opt, const std::string &short_opt, const bool is_optional) :
+            m_long_opt(long_opt),
+            m_short_opt(short_opt),
+            m_is_optional(is_optional),
+            m_is_present(false),
+            m_value("") {}
+
+    /*!
+    * Check if the supplied key matches the option
+    */
+    bool operator==(const std::string &option) const {
+        return option == m_short_opt || option == m_long_opt;
+    }
+
+    /*!
+    * Return whether the option is optional
+    */
+    bool is_optional() const {
+        return m_is_optional;
+    }
+
+    /*!
+    * Return whether the option is present on the command line
+    */
+    bool is_present() const {
+        return m_is_present;
+    }
+
+    /*!
+    * Sets the option as present on the command line
+    */
+    void set_present() {
+        m_is_present = true;
+    }
+
+    /*!
+    * Return the value of the option given from the command line
+    */
+    const std::string &get_value() const {
+        return m_value;
+    }
+
+    /*!
+    * Return the name of the option (it's long command option)
+    */
+    const std::string &get_name() const {
+        return m_long_opt;
+    }
+
+    /*!
+    * Sets the value of the option from the command line
+    */
+    void set_value(const std::string &mValue) {
+        m_value = mValue;
+    }
+
+private:
+
+    //member variables
+    const std::string m_long_opt;      //!< Long command option
+    const std::string m_short_opt;     //!< Short command option
+    const bool        m_is_optional;   //!< Option is optional or compulsory
+    bool              m_is_present;    //!< Option is present on the command line
+    std::string       m_value;         //!< Option value
+};
+
+
diff --git a/cmdline/CtaSendEvent.cpp b/cmdline/CtaSendEvent.cpp
index 3c0e52da2cf694eb13a11a738c280c34b8ffb8b6..52331be48d98bb45280c24c047a3e72662c8e978 100644
--- a/cmdline/CtaSendEvent.cpp
+++ b/cmdline/CtaSendEvent.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -25,6 +25,7 @@
 #include <common/checksum/ChecksumBlobSerDeser.hpp>
 #include "CtaFrontendApi.hpp"
 #include "version.h"
+#include "CtaCmdOptions.hpp"
 
 const std::string config_file = "/etc/cta/cta-cli.conf";
 
@@ -47,7 +48,51 @@ void RequestCallback<cta::xrd::Alert>::operator()(const cta::xrd::Alert &alert)
 typedef std::map<std::string, std::string> AttrMap;
 
 // Usage exception
-const std::runtime_error Usage("Usage: eos --json fileinfo /eos/path | cta-send-event CLOSEW|PREPARE");
+const std::runtime_error Usage("Usage: eos --json fileinfo /eos/path | cta-send-event CLOSEW|PREPARE "
+                               "-i/--eos.instance <instance> [-e/--eos.endpoint <url>] "
+                               "-u/--request.user <user> -g/--request.group <group>");
+
+StringOption option_instance {"--eos.instance", "-i", false};
+StringOption option_endpoint {"--eos.endpoint", "-e", true};
+StringOption option_user {"--request.user", "-u", false};
+StringOption option_group {"--request.group", "-g", false};
+
+
+std::map<std::string, StringOption*> option_map = {
+        {"-i", &option_instance},
+        {"--eos.instance", &option_instance},
+        {"-e", &option_endpoint},
+        {"--eos.endpoint", &option_endpoint},
+        {"-u", &option_user},
+        {"--request.user", &option_user},
+        {"-g", &option_group},
+        {"--request.group", &option_group},
+};
+
+
+void validate_cmd() {
+    for (auto &it: option_map) {
+        auto option = it.second;
+        if (!option->is_optional() && !option->is_present()) {
+            std::cout << "Error: Option " << option->get_name() << " is mandatory but not present." << std::endl;
+            throw Usage;
+        }
+    }
+}
+
+void parse_cmd(const int argc, const char *const *const argv) {
+    for (int i = 2; i < argc; i += 2) {
+        auto search = option_map.find(argv[i]);
+        if (search == option_map.end()) {
+            std::cout << "Error: Unknown option: " << argv[i] << std::endl;
+            throw Usage;
+        }
+        auto option = search->second;
+        option->set_present();
+        option->set_value(argv[i + 1]);
+    }
+}
+
 
 // remove leading spaces and quotes
 void ltrim(std::string &s) {
@@ -105,19 +150,17 @@ void parseFileInfo(std::istream &in, AttrMap &attr, AttrMap &xattr)
  * @param[in]    config          The XrdSsiPb object containing the configuration parameters
  * @param[in]    wf_command      The workflow command (CLOSEW or PREPARE)
  */
-void fillNotification(cta::eos::Notification &notification, const std::string &wf_command)
+void fillNotification(cta::eos::Notification &notification, const std::string &wf_command,
+                      const int argc, const char *const *const argv)
 {
-  XrdSsiPb::Config config(config_file, "eos");
 
-  for(auto &conf_option : std::vector<std::string>({ "instance", "requester.user", "requester.group" })) {
-    if(!config.getOptionValueStr(conf_option).first) {
-      throw std::runtime_error(conf_option + " must be specified in " + config_file);
-    }
-  }
-  const std::string &eos_instance = config.getOptionValueStr("instance").second;
-  const std::string &eos_endpoint = config.getOptionValueStr("endpoint").first ? config.getOptionValueStr("endpoint").second : "localhost:1095";
-  const std::string &requester_user = config.getOptionValueStr("requester.user").second;
-  const std::string &requester_group = config.getOptionValueStr("requester.group").second;
+  parse_cmd(argc, argv);
+  validate_cmd();
+
+  const std::string &eos_instance = option_instance.get_value();
+  const std::string &eos_endpoint = option_endpoint.is_present() ?option_endpoint.get_value() : "localhost:1095";
+  const std::string &requester_user = option_user.get_value();
+  const std::string &requester_group = option_group.get_value();
 
   // Set the event type
   if(wf_command == "CLOSEW") {
@@ -195,7 +238,7 @@ void fillNotification(cta::eos::Notification &notification, const std::string &w
  */
 int exceptionThrowingMain(int argc, const char *const *const argv)
 {
-  if(argc != 2) {
+  if(argc % 2) {
     throw Usage;
   }
 
@@ -224,7 +267,7 @@ int exceptionThrowingMain(int argc, const char *const *const argv)
   config.getEnv("log", "XrdSsiPbLogLevel");
 
   // Parse the command line arguments: fill the Notification fields
-  fillNotification(notification, argv[1]);
+  fillNotification(notification, argv[1], argc, argv);
 
   // Obtain a Service Provider
   XrdSsiPbServiceType cta_service(config);
diff --git a/cmdline/CtaVerifyFile.cpp b/cmdline/CtaVerifyFile.cpp
index 6d888fa4366f172eedb352412bdd06fe166806c9..6509575a148d3dc0d384833af9957c7424634627 100644
--- a/cmdline/CtaVerifyFile.cpp
+++ b/cmdline/CtaVerifyFile.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -21,6 +21,7 @@
 
 #include "CtaFrontendApi.hpp"
 #include "version.h"
+#include "CtaCmdOptions.hpp"
 
 const std::string config_file = "/etc/cta/cta-cli.conf";
 
@@ -43,51 +44,92 @@ void RequestCallback<cta::xrd::Alert>::operator()(const cta::xrd::Alert &alert)
 typedef std::map<std::string, std::string> AttrMap;
 
 // Usage exception
-const std::runtime_error Usage("Usage: cta-verify-file archiveFileID [vid]");
+const std::runtime_error Usage("Usage: cta-verify-file <archiveFileID> [-v <vid>] "
+                               "-i <instance> -r.user <user> -r.group <group>\n"
+                               "cta-verify-file <archiveFileID> [--vid <id>] "
+                               "--instance <instance> --request.user <user> --request.group <group>");
+
+StringOption option_instance {"--instance", "-i", false};
+StringOption option_request_user {"--request.user", "-r.user", false};
+StringOption option_request_group {"--request.group", "-r.group", false};
+StringOption option_vid {"--vid", "-v", true};
+
+std::vector<StringOption*> verify_options = {&option_instance, &option_request_user, &option_request_group, &option_vid};
+
+std::map<std::string, StringOption*> option_map = {
+        {"-i", &option_instance},
+        {"--instance", &option_instance},
+        {"-r.user", &option_request_user},
+        {"--request.user", &option_request_user},
+        {"-r.group", &option_request_group},
+        {"--request.group", &option_request_group},
+        {"-v", &option_vid},
+        {"--vid", &option_vid},
+};
+
+void validate_cmd() {
+    for (auto &it: option_map) {
+        auto option = it.second;
+        if (!option->is_optional() && !option->is_present()) {
+            std::cout << "Error: Option " << option->get_name() << " is mandatory but not present." << std::endl;
+            throw Usage;
+        }
+    }
+}
+
+void parse_cmd(const int argc, const char *const *const argv) {
+    for (int i = 2; i < argc; i += 2) {
+        auto search = option_map.find(argv[i]);
+        if (search == option_map.end()) {
+            std::cout << "Error: Unknown option: " << argv[i] << std::endl;
+            throw Usage;
+        }
+        auto option = search->second;
+        option->set_present();
+        option->set_value(argv[i + 1]);
+    }
+}
 
 /*
  * Fill a Notification message from the command-line parameters and stdin
  *
  * @param[out]   notification    The protobuf to fill
- * @param[in]    config          The XrdSsiPb object containing the configuration parameters
- * @param[in]    archiveFileId   The ID of the file to retrieve
- * @param[in]    vid             If non-empty, restrict PREPARE requests to this tape only
+ * @param[in]    argc            Number of arguments passed on the command line
+ * @param[in]    argv            Command line arguments array
  */
-void fillNotification(cta::eos::Notification &notification, const std::string &archiveFileId, const std::string &vid)
+void fillNotification(cta::eos::Notification &notification, const int argc, const char *const *const argv)
 {
-  XrdSsiPb::Config config(config_file, "eos");
+    parse_cmd(argc, argv);
+    validate_cmd();
 
-  // WF
-  notification.mutable_wf()->set_event(cta::eos::Workflow::PREPARE);
+    std::string archiveFileId(argv[1]);
 
-  for(auto &conf_option : std::vector<std::string>({ "instance", "requester.user", "requester.group" })) {
-    if(!config.getOptionValueStr(conf_option).first) {
-      throw std::runtime_error(conf_option + " must be specified in " + config_file);
-    }
-  }
-  notification.mutable_wf()->mutable_instance()->set_name(config.getOptionValueStr("instance").second);
-  notification.mutable_wf()->set_requester_instance("cta-verify-file");
-  notification.mutable_wf()->set_verify_only(true);
-  notification.mutable_wf()->set_vid(vid);
+    // WF
+    notification.mutable_wf()->set_event(cta::eos::Workflow::PREPARE);
 
-  // CLI
-  notification.mutable_cli()->mutable_user()->set_username(config.getOptionValueStr("requester.user").second);
-  notification.mutable_cli()->mutable_user()->set_groupname(config.getOptionValueStr("requester.group").second);
+    notification.mutable_wf()->mutable_instance()->set_name(option_instance.get_value());
+    notification.mutable_wf()->set_requester_instance("cta-verify-file");
+    notification.mutable_wf()->set_verify_only(true);
+    notification.mutable_wf()->set_vid(option_vid.get_value());
 
-  // Transport
-  notification.mutable_transport()->set_dst_url("file://dummy");
+    // CLI
+    notification.mutable_cli()->mutable_user()->set_username(option_request_user.get_value());
+    notification.mutable_cli()->mutable_user()->set_groupname(option_request_group.get_value());
 
-  // File
-  notification.mutable_file()->set_lpath("dummy");
+    // Transport
+    notification.mutable_transport()->set_dst_url("file://dummy");
 
-  // eXtended attributes
-  AttrMap xattrs;
-  xattrs["sys.archive.file_id"] = archiveFileId;
+    // File
+    notification.mutable_file()->set_lpath("dummy");
 
-  for(auto &xattr : xattrs) {
-    google::protobuf::MapPair<std::string,std::string> mp(xattr.first, xattr.second);
-    notification.mutable_file()->mutable_xattr()->insert(mp);
-  }
+    // eXtended attributes
+    AttrMap xattrs;
+    xattrs["sys.archive.file_id"] = archiveFileId;
+
+    for(auto &xattr : xattrs) {
+        google::protobuf::MapPair<std::string,std::string> mp(xattr.first, xattr.second);
+        notification.mutable_file()->mutable_xattr()->insert(mp);
+    }
 }
 
 
@@ -98,9 +140,7 @@ int exceptionThrowingMain(int argc, const char *const *const argv)
 {
   std::string vid;
 
-  if(argc == 3) {
-    vid = argv[2];
-  } else if(argc != 2) {
+  if(argc < 6 || argc % 2) { // Since all options need values associated, argc should always be even
     throw Usage;
   }
 
@@ -129,7 +169,7 @@ int exceptionThrowingMain(int argc, const char *const *const argv)
   config.getEnv("log", "XrdSsiPbLogLevel");
 
   // Parse the command line arguments: fill the Notification fields
-  fillNotification(notification, argv[1], vid);
+  fillNotification(notification, argc, argv);
 
   // Obtain a Service Provider
   XrdSsiPbServiceType cta_service(config);
@@ -162,7 +202,7 @@ int exceptionThrowingMain(int argc, const char *const *const argv)
  */
 int main(int argc, const char **argv)
 {
-  try {    
+  try {
     return exceptionThrowingMain(argc, argv);
   } catch (XrdSsiPb::PbException &ex) {
     std::cerr << "Error in Google Protocol Buffers: " << ex.what() << std::endl;
diff --git a/cmdline/EosCtaStub.cpp b/cmdline/EosCtaStub.cpp
index f1ec5bd8a1ce68490c188e6e490276d5cc829701..a7417a3f94544bb93387213f12b0ee07348cadb0 100644
--- a/cmdline/EosCtaStub.cpp
+++ b/cmdline/EosCtaStub.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/CRC.cpp b/common/CRC.cpp
index b7b688ecbc3784bc42015ae242a2d84a967b26d3..f42a0d949d2d1e018cfab9621d0d763dbd4c2db6 100644
--- a/common/CRC.cpp
+++ b/common/CRC.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/CRC.hpp b/common/CRC.hpp
index af7ecde85b03aa2df5e82377775d07c22de59b5f..0923486b8044913f42e6f2bb880a2498c016399d 100644
--- a/common/CRC.hpp
+++ b/common/CRC.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/CRCTest.cpp b/common/CRCTest.cpp
index f798b6acf5eda8a8f2f9b585789f5689cb8d2db3..588cab95099cb0837aa67c0cda827d61cea8d70e 100644
--- a/common/CRCTest.cpp
+++ b/common/CRCTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/Configuration.cpp b/common/Configuration.cpp
index c7213620d75f25b669eee3099db2e02c2c0328c5..a45f7bc3e05ec03649d304c90eba645482b2d0d7 100644
--- a/common/Configuration.cpp
+++ b/common/Configuration.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/Configuration.hpp b/common/Configuration.hpp
index d9f77a6a26af7458ff78dbe7c0ffbc4e0a708d83..67081d481c87c84f85819b2c7d38431b777eeb46 100644
--- a/common/Configuration.hpp
+++ b/common/Configuration.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/ConfigurationFile.cpp b/common/ConfigurationFile.cpp
index 90595806067ddf9e5d99f25296bc7541bbf539d4..6fa125ead8b9accbf56d0c5784bf580aca9c4136 100644
--- a/common/ConfigurationFile.cpp
+++ b/common/ConfigurationFile.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/ConfigurationFile.hpp b/common/ConfigurationFile.hpp
index c09680692a043977d2f25362a69d54d7fafdfd2f..f16876759629e3780aaa20a7ea07369d67533cb2 100644
--- a/common/ConfigurationFile.hpp
+++ b/common/ConfigurationFile.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/ConfigurationFileTests.cpp b/common/ConfigurationFileTests.cpp
index e65f101d03ea0d19dbcf3e5fffa832de7959173b..2d83ac89f14e3a4e7a53a8dce2709034eed98bdd 100644
--- a/common/ConfigurationFileTests.cpp
+++ b/common/ConfigurationFileTests.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/Constants.hpp b/common/Constants.hpp
index 9b61dc06e663f7ef7fa3e8a71b1aa50390b6a4ce..c3bfb1ceac38eb448142b1afe429f1f98d313644 100644
--- a/common/Constants.hpp
+++ b/common/Constants.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/CreationLog.cpp b/common/CreationLog.cpp
index 3ff2f68100981500b5b638a80f41bce31869d324..b6a8c0218f3edb7335b10137676e6c506217a390 100644
--- a/common/CreationLog.cpp
+++ b/common/CreationLog.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/CreationLog.hpp b/common/CreationLog.hpp
index b03cce05f86a526f9268634e3a264da03623dbec..6c72456b5cc30a86073630304ed0ba34d4c05e19 100644
--- a/common/CreationLog.hpp
+++ b/common/CreationLog.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/DriveState.hpp b/common/DriveState.hpp
index 9dd9cd94a79f28fa35103fb2e38cc30616caf7c4..340e7e88971c94c7b3179a95d5bc10e2bcfa691d 100644
--- a/common/DriveState.hpp
+++ b/common/DriveState.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/MountControl.hpp b/common/MountControl.hpp
index 20ff62e0e30bf9040291e62425d24caf967718fa..16e1a8319c14c70d35af9742a9e4dd3dc34cf1a3 100644
--- a/common/MountControl.hpp
+++ b/common/MountControl.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/SmartArrayPtr.hpp b/common/SmartArrayPtr.hpp
index 0a3be974963686f0faa8e298ede5a669312df720..ddfb57773d10fba815ea9cf19e45d426af43974b 100644
--- a/common/SmartArrayPtr.hpp
+++ b/common/SmartArrayPtr.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/SmartArrayPtrTest.cpp b/common/SmartArrayPtrTest.cpp
index 8788329abe8bd8278e7b6af2abd09249ff87d0dd..2c82c06430dd13e56f46a32c9798c3a2039cd912 100644
--- a/common/SmartArrayPtrTest.cpp
+++ b/common/SmartArrayPtrTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/SmartFILEPtr.cpp b/common/SmartFILEPtr.cpp
index e1c77c2c4ba6b5495beda7c2307318a4f02d6194..9b20c834c30810f23ec7c5ad1b4493c8b7040c36 100644
--- a/common/SmartFILEPtr.cpp
+++ b/common/SmartFILEPtr.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/SmartFILEPtr.hpp b/common/SmartFILEPtr.hpp
index dd89a03ea846092fdf95b5f3da1bd14095c29b29..f6799fb482726626711100d7ffad594453e07c0c 100644
--- a/common/SmartFILEPtr.hpp
+++ b/common/SmartFILEPtr.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/SmartFd.cpp b/common/SmartFd.cpp
index 97b8f0dbc1d8d80752c5060aae538b0662f7d9d2..d67b1595b31ff8d5479cf87ad11352ffcd964937 100644
--- a/common/SmartFd.cpp
+++ b/common/SmartFd.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/SmartFd.hpp b/common/SmartFd.hpp
index 1f25c50745e0b322a4140125fe7528bd56ab2fb2..c8c82d5f798c7920f32d437916100bf7824f6f2d 100644
--- a/common/SmartFd.hpp
+++ b/common/SmartFd.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/SmartFdTest.cpp b/common/SmartFdTest.cpp
index aa9e4a8bb0ba0a7e459b6d2e71361aca908e4080..09db126c4d4e81dbb3164ccefe3f2a5272f38ac4 100644
--- a/common/SmartFdTest.cpp
+++ b/common/SmartFdTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/SourcedParameter.cpp b/common/SourcedParameter.cpp
index 1ef3bd04fb2679840db2860421206cb4b6738323..03a7239b894c4d3d56b23ccf017dc85cfc1aec9c 100644
--- a/common/SourcedParameter.cpp
+++ b/common/SourcedParameter.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/SourcedParameter.hpp b/common/SourcedParameter.hpp
index 81910162ebd39d7fc699dd309c7740affb9423a5..da87194ccb51038ac46b9e755817df65c1077e04 100644
--- a/common/SourcedParameter.hpp
+++ b/common/SourcedParameter.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/SourcedParameterTests.cpp b/common/SourcedParameterTests.cpp
index f1b95001809d086bc5af1a9867614816772f0ce7..7a1b8471ec85f8385e3e078793a4afbafddb936d 100644
--- a/common/SourcedParameterTests.cpp
+++ b/common/SourcedParameterTests.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/Timer.cpp b/common/Timer.cpp
index e801f87cf48017cc3f57f4b20883136ffb814131..214c43124507a331568573bfa8b9e2d1e90be114 100644
--- a/common/Timer.cpp
+++ b/common/Timer.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/Timer.hpp b/common/Timer.hpp
index 2326352b8fa28d6fbca964192c1fdc1412c04fb4..5c9967bafb782e3b93819beb3be60ff59f4a2315 100644
--- a/common/Timer.hpp
+++ b/common/Timer.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/checksum/ChecksumBlob.cpp b/common/checksum/ChecksumBlob.cpp
index 87a92eb56a929597fb80de05bcfffaf1ef547aee..26dba5707b1ce24608d95e15b0d4c69c0578b646 100644
--- a/common/checksum/ChecksumBlob.cpp
+++ b/common/checksum/ChecksumBlob.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/checksum/ChecksumBlob.hpp b/common/checksum/ChecksumBlob.hpp
index 4d84b7e1f111546272b2ed5b42430b26bef0e827..888ec69d453518a8cc4dd25ef628cd1bb3584fad 100644
--- a/common/checksum/ChecksumBlob.hpp
+++ b/common/checksum/ChecksumBlob.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/checksum/ChecksumBlobSerDeser.hpp b/common/checksum/ChecksumBlobSerDeser.hpp
index c50c62e8703b5abd9807f4436504b946dc102570..ba8c04aa514bba69caf12dacd65d9ac2759ce156 100644
--- a/common/checksum/ChecksumBlobSerDeser.hpp
+++ b/common/checksum/ChecksumBlobSerDeser.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/checksum/ChecksumBlobTest.cpp b/common/checksum/ChecksumBlobTest.cpp
index fdcc0565c00ef238d36fca8564de7abd87e470aa..7e37cffd1ab027a58072b54db616af5c27dc0a88 100644
--- a/common/checksum/ChecksumBlobTest.cpp
+++ b/common/checksum/ChecksumBlobTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/ActivitiesFairShareWeights.cpp b/common/dataStructures/ActivitiesFairShareWeights.cpp
index c101e0b661512db0e7eac39a3cae371f3c9feb3d..cb269a54ac3e30758f21b2aa1eba138c124c2360 100644
--- a/common/dataStructures/ActivitiesFairShareWeights.cpp
+++ b/common/dataStructures/ActivitiesFairShareWeights.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/ActivitiesFairShareWeights.hpp b/common/dataStructures/ActivitiesFairShareWeights.hpp
index 9b2c1bc63019628141d73065235ab1c10c532417..ccb98892f13ba334df66c56bbefdfaf899cce919 100644
--- a/common/dataStructures/ActivitiesFairShareWeights.hpp
+++ b/common/dataStructures/ActivitiesFairShareWeights.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/AdminUser.cpp b/common/dataStructures/AdminUser.cpp
index 62e2dcfa81af6618df473c183236d97ec11f0fe7..35a99d7fff84d76a86447bc827adbd3933a88dd3 100644
--- a/common/dataStructures/AdminUser.cpp
+++ b/common/dataStructures/AdminUser.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/AdminUser.hpp b/common/dataStructures/AdminUser.hpp
index af045d6c3888887b0c7442de9c0a3423ef098c5e..d29af3e059b650199b709b8b63f7fbc9f705496f 100644
--- a/common/dataStructures/AdminUser.hpp
+++ b/common/dataStructures/AdminUser.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/ArchiveFile.cpp b/common/dataStructures/ArchiveFile.cpp
index 14f724f9c1892bfc656e9a5cec7a70a8fcde6783..fa11b400461bae2005eebb9d0f95fa266207a122 100644
--- a/common/dataStructures/ArchiveFile.cpp
+++ b/common/dataStructures/ArchiveFile.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/ArchiveFile.hpp b/common/dataStructures/ArchiveFile.hpp
index 5f31c1ac6dba75630e7ab0bf7bb3cfeec51714c4..1049d90bdfbc16a9d52dec2d0859d505bacc64dc 100644
--- a/common/dataStructures/ArchiveFile.hpp
+++ b/common/dataStructures/ArchiveFile.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/ArchiveFileQueueCriteria.cpp b/common/dataStructures/ArchiveFileQueueCriteria.cpp
index 34ca07567618bd5394ab3cca266bb1f0a81288fc..f7b88b45559cc382a66a0fe915850dc54862d6a5 100644
--- a/common/dataStructures/ArchiveFileQueueCriteria.cpp
+++ b/common/dataStructures/ArchiveFileQueueCriteria.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/ArchiveFileQueueCriteria.hpp b/common/dataStructures/ArchiveFileQueueCriteria.hpp
index 714090d9e1cb021fb5179c67dbda14a86cbd594a..b986c1d977a83abb5f4c94e296bc9498ca10595c 100644
--- a/common/dataStructures/ArchiveFileQueueCriteria.hpp
+++ b/common/dataStructures/ArchiveFileQueueCriteria.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/ArchiveFileQueueCriteriaAndFileId.cpp b/common/dataStructures/ArchiveFileQueueCriteriaAndFileId.cpp
index abc2fde43c6d32912283ff16e754965d1cad92bc..fcee1763c96294c1b9b16fb1067f5c6fb87e6a0a 100644
--- a/common/dataStructures/ArchiveFileQueueCriteriaAndFileId.cpp
+++ b/common/dataStructures/ArchiveFileQueueCriteriaAndFileId.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/ArchiveFileQueueCriteriaAndFileId.hpp b/common/dataStructures/ArchiveFileQueueCriteriaAndFileId.hpp
index 6ab993dd60c4700ad2f9bd58bcf60dc314b3ee95..b1f3c6007735b4c92b686023b2e7e72c15258eb6 100644
--- a/common/dataStructures/ArchiveFileQueueCriteriaAndFileId.hpp
+++ b/common/dataStructures/ArchiveFileQueueCriteriaAndFileId.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/ArchiveFileSummary.cpp b/common/dataStructures/ArchiveFileSummary.cpp
index ef43ed6c930d2d654d5c45f22a6e184b51db9e29..0e559100e7cbd8a5857c62e42937e06bc66b92b6 100644
--- a/common/dataStructures/ArchiveFileSummary.cpp
+++ b/common/dataStructures/ArchiveFileSummary.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/ArchiveFileSummary.hpp b/common/dataStructures/ArchiveFileSummary.hpp
index 7123036e37315340f09db11753e3a0015d427c70..1bde456dee1d300f57dab0681d5b7772aef7e18d 100644
--- a/common/dataStructures/ArchiveFileSummary.hpp
+++ b/common/dataStructures/ArchiveFileSummary.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/ArchiveFileTest.cpp b/common/dataStructures/ArchiveFileTest.cpp
index 83806df4d256cf7d8bef1d1aa0a3249cab9f4183..15e1ed9d515eefac872d039d48c4e4d031ce6307 100644
--- a/common/dataStructures/ArchiveFileTest.cpp
+++ b/common/dataStructures/ArchiveFileTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/ArchiveJob.cpp b/common/dataStructures/ArchiveJob.cpp
index 7c244c5f7f216ee5d3eb712129ea47b7e48c6ba5..eda924a0a3e6ee2d205eb40de3b29e01454ef324 100644
--- a/common/dataStructures/ArchiveJob.cpp
+++ b/common/dataStructures/ArchiveJob.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/ArchiveJob.hpp b/common/dataStructures/ArchiveJob.hpp
index dd0a056c85fae398ba265a225fcd158bcaac16e4..367fad56d8db0f9f5e7647575272aa3a4a1476f0 100644
--- a/common/dataStructures/ArchiveJob.hpp
+++ b/common/dataStructures/ArchiveJob.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/ArchiveRequest.cpp b/common/dataStructures/ArchiveRequest.cpp
index 2e228f0b8f694f08d362ea1c606a15abe5f0c1ec..9f693e907580cd2932d69efe6887c7124585b639 100644
--- a/common/dataStructures/ArchiveRequest.cpp
+++ b/common/dataStructures/ArchiveRequest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/ArchiveRequest.hpp b/common/dataStructures/ArchiveRequest.hpp
index 4f0768a44783d9e195df0cc5c04bc2ed251cc4ca..064c962bc3151d6874d56ac6fd2348c979b5b593 100644
--- a/common/dataStructures/ArchiveRequest.hpp
+++ b/common/dataStructures/ArchiveRequest.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/ArchiveRoute.cpp b/common/dataStructures/ArchiveRoute.cpp
index 07ed32e8d3b6a68226fe498ab8d51a14572dc210..20a6f3478625d75d3662fa3e1218fff33bae677d 100644
--- a/common/dataStructures/ArchiveRoute.cpp
+++ b/common/dataStructures/ArchiveRoute.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/ArchiveRoute.hpp b/common/dataStructures/ArchiveRoute.hpp
index 3a815b0cda33d41cb666a7eb7b34e3a90d734f11..3b55cee8cb361794cd90b71d7afd7cfaf56171cf 100644
--- a/common/dataStructures/ArchiveRoute.hpp
+++ b/common/dataStructures/ArchiveRoute.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/CancelRetrieveRequest.cpp b/common/dataStructures/CancelRetrieveRequest.cpp
index e4a94e44301c6997a46a525dbc6448f34a10497d..1b477a915d40a5d7df8085ee2e6ee0a91d4d5b30 100644
--- a/common/dataStructures/CancelRetrieveRequest.cpp
+++ b/common/dataStructures/CancelRetrieveRequest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/CancelRetrieveRequest.hpp b/common/dataStructures/CancelRetrieveRequest.hpp
index 1b302691bc6458f8a7aed39707023d5ba96f7ae6..5a23bac835e64855946a2b71e6e6936e894beea0 100644
--- a/common/dataStructures/CancelRetrieveRequest.hpp
+++ b/common/dataStructures/CancelRetrieveRequest.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/DeleteArchiveRequest.cpp b/common/dataStructures/DeleteArchiveRequest.cpp
index 98999088fb2afc23b8bfa2db6e41bf9abe0c3e0b..18df09d46d0ed892bbb55804e866080e302df9d5 100644
--- a/common/dataStructures/DeleteArchiveRequest.cpp
+++ b/common/dataStructures/DeleteArchiveRequest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/DeleteArchiveRequest.hpp b/common/dataStructures/DeleteArchiveRequest.hpp
index 4abc915a3538b1d4eda4fd15c92e9cd441a63f66..e3e4cc1fd118ddf2a7053d6f0abac50555a0f45b 100644
--- a/common/dataStructures/DeleteArchiveRequest.hpp
+++ b/common/dataStructures/DeleteArchiveRequest.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/DesiredDriveState.cpp b/common/dataStructures/DesiredDriveState.cpp
index 2cc46dedb0f1c4837351c62b78ec40b0d081b516..e37f05c55f8dcf7132bc6593339e510804514a41 100644
--- a/common/dataStructures/DesiredDriveState.cpp
+++ b/common/dataStructures/DesiredDriveState.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/DesiredDriveState.hpp b/common/dataStructures/DesiredDriveState.hpp
index ef18ede81d057c21ca37a62de56e7fb4ceef1df5..4eb13d766e29a7c4fca82d2b3c9ccd71ba5eb8a6 100644
--- a/common/dataStructures/DesiredDriveState.hpp
+++ b/common/dataStructures/DesiredDriveState.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/DiskFileInfo.cpp b/common/dataStructures/DiskFileInfo.cpp
index ef5df4e45bf246047c6ce08a8cc1cbdd5091dddb..6ce67e1f6c5e0361b25c868915ab832fe53e4153 100644
--- a/common/dataStructures/DiskFileInfo.cpp
+++ b/common/dataStructures/DiskFileInfo.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/DiskFileInfo.hpp b/common/dataStructures/DiskFileInfo.hpp
index e4435f9042aea98aadf1cf09af2395fc84c6bf4c..aaffc0323dbcf3a9cba56dec9c9ca513e8609c49 100644
--- a/common/dataStructures/DiskFileInfo.hpp
+++ b/common/dataStructures/DiskFileInfo.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/DriveInfo.hpp b/common/dataStructures/DriveInfo.hpp
index 7bfcf911225ca0db5cab8f500c1ba6ee08b52046..1f12bfbaf288506ff0f9826c0ebda7fc6f25958b 100644
--- a/common/dataStructures/DriveInfo.hpp
+++ b/common/dataStructures/DriveInfo.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/DriveNextState.hpp b/common/dataStructures/DriveNextState.hpp
index 9f00fc2900889d4b40eceaf2edb913318ad13916..04089985687f698d66689edfa284aaa32f81bc53 100644
--- a/common/dataStructures/DriveNextState.hpp
+++ b/common/dataStructures/DriveNextState.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/DriveState.cpp b/common/dataStructures/DriveState.cpp
index e38524b122e23beabad6d6fd081205ff012c85b4..2148361e5c48a357258b7cf6df00a9d46475f0bc 100644
--- a/common/dataStructures/DriveState.cpp
+++ b/common/dataStructures/DriveState.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/DriveState.hpp b/common/dataStructures/DriveState.hpp
index 09b793a3d6f4306f5f82d1655f994a75087b81e9..2354389e06d948bb9244732f5f9ce3b62efcf8ad 100644
--- a/common/dataStructures/DriveState.hpp
+++ b/common/dataStructures/DriveState.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/DriveStatus.cpp b/common/dataStructures/DriveStatus.cpp
index c6abbe44be77638e37784706595a06f27ac8fcd7..94296e0ff90a54df738b49be5c2a46c8cde50330 100644
--- a/common/dataStructures/DriveStatus.cpp
+++ b/common/dataStructures/DriveStatus.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/DriveStatus.hpp b/common/dataStructures/DriveStatus.hpp
index 744a5c8cdbbddacd057e7d3546cef59543019239..63b1168230d94523f196329381430a573bad8e18 100644
--- a/common/dataStructures/DriveStatus.hpp
+++ b/common/dataStructures/DriveStatus.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/DriveStatusSerDeser.hpp b/common/dataStructures/DriveStatusSerDeser.hpp
index 7643769d0e2e36a6e56d5cd221e0e524d765c061..0a9a22c8cb34ecca2b8389c46719d210819c608f 100644
--- a/common/dataStructures/DriveStatusSerDeser.hpp
+++ b/common/dataStructures/DriveStatusSerDeser.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/EntryLog.cpp b/common/dataStructures/EntryLog.cpp
index ab37049ec4dd97c1eb8ea44cc5cb5b1b2b0359e3..9be64700f32717525f44d6501117bd1cb41c17b9 100644
--- a/common/dataStructures/EntryLog.cpp
+++ b/common/dataStructures/EntryLog.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/EntryLog.hpp b/common/dataStructures/EntryLog.hpp
index 8863b410c804d0bfcfb65722b0b7d9837f8ce659..cda13a313817661a4c393d71b3e65865edb11a96 100644
--- a/common/dataStructures/EntryLog.hpp
+++ b/common/dataStructures/EntryLog.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/FileRecycleLog.cpp b/common/dataStructures/FileRecycleLog.cpp
index 2fde872863be679d8e7a1c18f54ad6136bf8c06e..636ac22a634f1267a1b6072c7b07e6b73d1e73ca 100644
--- a/common/dataStructures/FileRecycleLog.cpp
+++ b/common/dataStructures/FileRecycleLog.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/FileRecycleLog.hpp b/common/dataStructures/FileRecycleLog.hpp
index 2fcf7d10ce06ba03726354f63f89ca99057a9a55..df59ca6b413e5de4aa81ae8b548e290bdcd8c1d8 100644
--- a/common/dataStructures/FileRecycleLog.hpp
+++ b/common/dataStructures/FileRecycleLog.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/FrontendReturnCode.cpp b/common/dataStructures/FrontendReturnCode.cpp
index e65a12c1026d117dcd5dc2363fc4e061ecc7c5bd..db4df97a4efdb7fb1be29b9eb499e959371ff743 100644
--- a/common/dataStructures/FrontendReturnCode.cpp
+++ b/common/dataStructures/FrontendReturnCode.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/FrontendReturnCode.hpp b/common/dataStructures/FrontendReturnCode.hpp
index dd8100e198bf173eb94d84a4ff8cc8460f2e25ed..7813d67b3417e3b578142859a23d849b3a0ab467 100644
--- a/common/dataStructures/FrontendReturnCode.hpp
+++ b/common/dataStructures/FrontendReturnCode.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/LifecycleTimings.cpp b/common/dataStructures/LifecycleTimings.cpp
index 813170aa31344ed2f16b576d80c8c9840c18f786..81b2c81f8c546dbfc6695e71e5c872c0118ca12d 100644
--- a/common/dataStructures/LifecycleTimings.cpp
+++ b/common/dataStructures/LifecycleTimings.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/LifecycleTimings.hpp b/common/dataStructures/LifecycleTimings.hpp
index 091d4b55b08b99d8e81dcde0523a45ea3e22b7c2..1383acac3ba270c5ebd48a2ed8372d3b0169ff73 100644
--- a/common/dataStructures/LifecycleTimings.hpp
+++ b/common/dataStructures/LifecycleTimings.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/ListStorageClassRequest.cpp b/common/dataStructures/ListStorageClassRequest.cpp
index a31e139381dcf529e1b2ee7382ab43d781b36385..7489a9237cba76b17ced9d7a9ac75a8c1798acfb 100644
--- a/common/dataStructures/ListStorageClassRequest.cpp
+++ b/common/dataStructures/ListStorageClassRequest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/ListStorageClassRequest.hpp b/common/dataStructures/ListStorageClassRequest.hpp
index 859cc1df4ec77305eb24fb935147364aa53d9542..0013a44dd9528a93d293d2f78b78d588ffb8e3b6 100644
--- a/common/dataStructures/ListStorageClassRequest.hpp
+++ b/common/dataStructures/ListStorageClassRequest.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/LogicalLibrary.cpp b/common/dataStructures/LogicalLibrary.cpp
index 0e38acada83fd638f0ddd4b9bf2610c51a445f4a..aa9623ce7ffe2e0419a0140d5dd390d25f201aef 100644
--- a/common/dataStructures/LogicalLibrary.cpp
+++ b/common/dataStructures/LogicalLibrary.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/LogicalLibrary.hpp b/common/dataStructures/LogicalLibrary.hpp
index 8e86d046a9a8810bfadb25506b007f70b67989cb..40656e2139c567832d7544fff7fb49ad24b444c8 100644
--- a/common/dataStructures/LogicalLibrary.hpp
+++ b/common/dataStructures/LogicalLibrary.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/LogicalLibraryTest.cpp b/common/dataStructures/LogicalLibraryTest.cpp
index d0527ba79f7f975381a12a173a08c733e898d582..13f5ca3fce6053062f3695d08e3c3b54a30e446e 100644
--- a/common/dataStructures/LogicalLibraryTest.cpp
+++ b/common/dataStructures/LogicalLibraryTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/MountPolicy.cpp b/common/dataStructures/MountPolicy.cpp
index c2f439b7a7de51ddab5a432b10cb13ceb4aff90e..f144b7a644d344380309c966c98bf37975bfde97 100644
--- a/common/dataStructures/MountPolicy.cpp
+++ b/common/dataStructures/MountPolicy.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/MountPolicy.hpp b/common/dataStructures/MountPolicy.hpp
index 8bcdea878df92568f526e1317b9abfee5f5dbf65..7460c917855a18d08015c48589512e775d2381f0 100644
--- a/common/dataStructures/MountPolicy.hpp
+++ b/common/dataStructures/MountPolicy.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/MountType.cpp b/common/dataStructures/MountType.cpp
index edfbcdfa4c91ff5080b7a7b0f3397930d61fa1e1..34983f10a9d04f709c15570bf02c44847dc5bdae 100644
--- a/common/dataStructures/MountType.cpp
+++ b/common/dataStructures/MountType.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/MountType.hpp b/common/dataStructures/MountType.hpp
index 88e19508b7cc5b29ed6b4d9cfab1b601a33afdea..6245f1eab9a4a6a649b5773cc09b7beb6d3be3c9 100644
--- a/common/dataStructures/MountType.hpp
+++ b/common/dataStructures/MountType.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/MountTypeSerDeser.hpp b/common/dataStructures/MountTypeSerDeser.hpp
index de85ac4ef29a505de16cdffd697ee5b4faa02b5f..b5f0b2f179d493395e60db13345cdb75033eedf1 100644
--- a/common/dataStructures/MountTypeSerDeser.hpp
+++ b/common/dataStructures/MountTypeSerDeser.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/OwnerIdentity.cpp b/common/dataStructures/OwnerIdentity.cpp
index 3e94eb705b100471733e237c6f9db24bd867c200..82acfc112ed9d91fc6a92b28f0e554d088ca93fb 100644
--- a/common/dataStructures/OwnerIdentity.cpp
+++ b/common/dataStructures/OwnerIdentity.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/OwnerIdentity.hpp b/common/dataStructures/OwnerIdentity.hpp
index 28a8697ba950a7b6d8f0ae9f86df8dc8725c17d1..bf8c7a165050bf6bed0805efd9a27ece79924f9e 100644
--- a/common/dataStructures/OwnerIdentity.hpp
+++ b/common/dataStructures/OwnerIdentity.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/QueueAndMountSummary.cpp b/common/dataStructures/QueueAndMountSummary.cpp
index 5eefb1638834ac81af38fa384c239d38116e2a8d..83f6bbad805354b90fd738a43027d2067e9f88b5 100644
--- a/common/dataStructures/QueueAndMountSummary.cpp
+++ b/common/dataStructures/QueueAndMountSummary.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/QueueAndMountSummary.hpp b/common/dataStructures/QueueAndMountSummary.hpp
index aaea1ccef170303b1914b1e574e2e07786ddb9f4..c84ff7ea4704a998eb85388206f04af720abfa35 100644
--- a/common/dataStructures/QueueAndMountSummary.hpp
+++ b/common/dataStructures/QueueAndMountSummary.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/ReadTestResult.cpp b/common/dataStructures/ReadTestResult.cpp
index c5416715c46b6c9db03e4a9d38c992c66436ef57..b7a0e25fc55b30fad1824423c72f717d6eadee43 100644
--- a/common/dataStructures/ReadTestResult.cpp
+++ b/common/dataStructures/ReadTestResult.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/ReadTestResult.hpp b/common/dataStructures/ReadTestResult.hpp
index 861d5d2ed50c2e8e617f820dbe97f1cc91f55b23..a05e2be09676e41392b827fe952c6fc4223c4225 100644
--- a/common/dataStructures/ReadTestResult.hpp
+++ b/common/dataStructures/ReadTestResult.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/RepackInfo.cpp b/common/dataStructures/RepackInfo.cpp
index ea06b6976a650d781b3027ec37f8f646c80c5e52..5edb0e9ee2cea0fa22a779e374172de9645f1f92 100644
--- a/common/dataStructures/RepackInfo.cpp
+++ b/common/dataStructures/RepackInfo.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/RepackInfo.hpp b/common/dataStructures/RepackInfo.hpp
index 1b713e451845293e72ef943f9b455153778a9264..11e2d56c1c01d8bd7b7b3464d0536d42f7ab5651 100644
--- a/common/dataStructures/RepackInfo.hpp
+++ b/common/dataStructures/RepackInfo.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/RepackQueueType.cpp b/common/dataStructures/RepackQueueType.cpp
index 69f53eeda18f8e84e725c40b6ec883166dc6e431..cc94e69fe50b90724d780ad310b32e3be057bbca 100644
--- a/common/dataStructures/RepackQueueType.cpp
+++ b/common/dataStructures/RepackQueueType.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/RepackQueueType.hpp b/common/dataStructures/RepackQueueType.hpp
index 26b152e4f4b313c486f568363a0a4d434f7413d5..b25c861f18d85e9be7a73f7483684fce5dd9578a 100644
--- a/common/dataStructures/RepackQueueType.hpp
+++ b/common/dataStructures/RepackQueueType.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/RequesterGroupMountRule.cpp b/common/dataStructures/RequesterGroupMountRule.cpp
index b083db3e41189671936dd0f803d6102f99973d71..88d4c6976983ced5d44e60e36804e267a1bc5991 100644
--- a/common/dataStructures/RequesterGroupMountRule.cpp
+++ b/common/dataStructures/RequesterGroupMountRule.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/RequesterGroupMountRule.hpp b/common/dataStructures/RequesterGroupMountRule.hpp
index 644124a2570c7e4c5faaf7f58458f34c3901c0c0..16a2b4754bde55028a8a516d3dee16fab0e67310 100644
--- a/common/dataStructures/RequesterGroupMountRule.hpp
+++ b/common/dataStructures/RequesterGroupMountRule.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/RequesterIdentity.cpp b/common/dataStructures/RequesterIdentity.cpp
index e461e5446c9b7e448748bdd59988877b155f71ce..69868955db83c55c17f57faa289da3603fb4de18 100644
--- a/common/dataStructures/RequesterIdentity.cpp
+++ b/common/dataStructures/RequesterIdentity.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/RequesterIdentity.hpp b/common/dataStructures/RequesterIdentity.hpp
index 406203cfcaab7f556dc4db90c6b6f4ef59da39b8..76713990111c038be6e8c5dc166ded91ee1a7494 100644
--- a/common/dataStructures/RequesterIdentity.hpp
+++ b/common/dataStructures/RequesterIdentity.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/RequesterMountRule.cpp b/common/dataStructures/RequesterMountRule.cpp
index 14fc0765f782673a0ad6378458b5911d4e720cee..35c43da1e838ff53e8ee215d22d17638460bbb02 100644
--- a/common/dataStructures/RequesterMountRule.cpp
+++ b/common/dataStructures/RequesterMountRule.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/RequesterMountRule.hpp b/common/dataStructures/RequesterMountRule.hpp
index 9446966c113f656d41e1f589d8d1c7b1489e9abe..a7500557f30e62f27e4eb27e071325b835b490e1 100644
--- a/common/dataStructures/RequesterMountRule.hpp
+++ b/common/dataStructures/RequesterMountRule.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/RetrieveFileQueueCriteria.cpp b/common/dataStructures/RetrieveFileQueueCriteria.cpp
index 5dafcba1fb4657b255c953e737d48222da4243ed..956fd5d4aa938345733e7eb228f57858e6e59a4b 100644
--- a/common/dataStructures/RetrieveFileQueueCriteria.cpp
+++ b/common/dataStructures/RetrieveFileQueueCriteria.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/RetrieveFileQueueCriteria.hpp b/common/dataStructures/RetrieveFileQueueCriteria.hpp
index 7c2e1a4fddc24528bc8663f094d5eeb6d9427401..3a683858ce8e44e44033820f000c2514e4abcf52 100644
--- a/common/dataStructures/RetrieveFileQueueCriteria.hpp
+++ b/common/dataStructures/RetrieveFileQueueCriteria.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/RetrieveJob.cpp b/common/dataStructures/RetrieveJob.cpp
index 22283e24107029a7270158ca6601e0b337561e78..8a0cc8f487d56b2af65544cb82379147928871e0 100644
--- a/common/dataStructures/RetrieveJob.cpp
+++ b/common/dataStructures/RetrieveJob.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/RetrieveJob.hpp b/common/dataStructures/RetrieveJob.hpp
index db1b7d0f1c63ed1b31cbbd5712af8ca83f0de36d..cabaa896586ff729a13bcf87cad013ea2fddeb88 100644
--- a/common/dataStructures/RetrieveJob.hpp
+++ b/common/dataStructures/RetrieveJob.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/RetrieveRequest.cpp b/common/dataStructures/RetrieveRequest.cpp
index feac644717db6b5ec3671aca533d619674d23fcb..7eaf9edcb4eab083817dd28e9593a7a131cdccfd 100644
--- a/common/dataStructures/RetrieveRequest.cpp
+++ b/common/dataStructures/RetrieveRequest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/RetrieveRequest.hpp b/common/dataStructures/RetrieveRequest.hpp
index 93732c0acc94d9da41e5a0fb02bb2cc2bff0e10c..c0e1ea59cfb05593a5b1971ce2403bc76fc643be 100644
--- a/common/dataStructures/RetrieveRequest.hpp
+++ b/common/dataStructures/RetrieveRequest.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/SecurityIdentity.cpp b/common/dataStructures/SecurityIdentity.cpp
index b33d91c6a1852a080bf242e64394a45210a73d55..a629109f8e301ef2f2b5b114fb9bd75313b82802 100644
--- a/common/dataStructures/SecurityIdentity.cpp
+++ b/common/dataStructures/SecurityIdentity.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/SecurityIdentity.hpp b/common/dataStructures/SecurityIdentity.hpp
index adc3487ed64730bbcbd5bababfa11a1ec989db79..425157dca96ce93f47bb7f0467b7ac8f97973105 100644
--- a/common/dataStructures/SecurityIdentity.hpp
+++ b/common/dataStructures/SecurityIdentity.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/StorageClass.cpp b/common/dataStructures/StorageClass.cpp
index 09559ac50a04c53c8e5c00671296c6ac306a3608..f9bd0b7617f225daf18a9ae304c90a473d5fd27a 100644
--- a/common/dataStructures/StorageClass.cpp
+++ b/common/dataStructures/StorageClass.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/StorageClass.hpp b/common/dataStructures/StorageClass.hpp
index fff07258faca4d2118b92ea9edc2f8d9fd18aa4c..934ad407c6ce7dada378dc0970a8d7ca6096f628 100644
--- a/common/dataStructures/StorageClass.hpp
+++ b/common/dataStructures/StorageClass.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/StorageClassTest.cpp b/common/dataStructures/StorageClassTest.cpp
index e0e8bc4075d7bbb7c631ba4435bea70bc68364b5..0e8c63ce8e2693afcf665a755d183ac41942181f 100644
--- a/common/dataStructures/StorageClassTest.cpp
+++ b/common/dataStructures/StorageClassTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/Tape.cpp b/common/dataStructures/Tape.cpp
index 59b07c00c587c768529e146b524031ed0156a116..c13c865f557466e8e031e85de027cd6e324d0fc2 100644
--- a/common/dataStructures/Tape.cpp
+++ b/common/dataStructures/Tape.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/Tape.hpp b/common/dataStructures/Tape.hpp
index ce9276a75b0cedecc22d71464cf3f854b983b877..223e997c49197c41f4671b4d38489ce469f713bd 100644
--- a/common/dataStructures/Tape.hpp
+++ b/common/dataStructures/Tape.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/TapeCopyToPoolMap.hpp b/common/dataStructures/TapeCopyToPoolMap.hpp
index 3a2ecd8cb0b02ae9ade6701659f7ba71b9be4e42..2c6f8ca0109dd8d97162aa04273b3c25f360f5b2 100644
--- a/common/dataStructures/TapeCopyToPoolMap.hpp
+++ b/common/dataStructures/TapeCopyToPoolMap.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/TapeFile.cpp b/common/dataStructures/TapeFile.cpp
index e31ccb23d822de0d3e68c174be2a3821319566f7..1c088ba2e18e3420e20a50091fdd5dfc00c46780 100644
--- a/common/dataStructures/TapeFile.cpp
+++ b/common/dataStructures/TapeFile.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/TapeFile.hpp b/common/dataStructures/TapeFile.hpp
index b73041e35b40f5193d8733e5fd886c28eaefc4f0..04656fa36f70dbb9d6500e17a8da03e8deb70b1d 100644
--- a/common/dataStructures/TapeFile.hpp
+++ b/common/dataStructures/TapeFile.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/TapeLog.cpp b/common/dataStructures/TapeLog.cpp
index d74a40964838116426f01299c8aa4bc332760214..c0fb01d5c2b8baaf0668f74eb93170312970239c 100644
--- a/common/dataStructures/TapeLog.cpp
+++ b/common/dataStructures/TapeLog.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/TapeLog.hpp b/common/dataStructures/TapeLog.hpp
index 1447d06ab7cdb9075311c3b0625386851cd9c7de..3bcdb4937fb2e3389da5e0860f6d3634bb553553 100644
--- a/common/dataStructures/TapeLog.hpp
+++ b/common/dataStructures/TapeLog.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/TestSourceType.cpp b/common/dataStructures/TestSourceType.cpp
index 14a03389c4cc1d1541576a3f151fa050f723b7db..ad3b0e951edc38838fca3a1879245573193201cc 100644
--- a/common/dataStructures/TestSourceType.cpp
+++ b/common/dataStructures/TestSourceType.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/TestSourceType.hpp b/common/dataStructures/TestSourceType.hpp
index 5ee08711fb5f2a0d95717c98de7b23eacf08acd4..00c8c05c3ce2ddf412e898288ec53e946d57a64f 100644
--- a/common/dataStructures/TestSourceType.hpp
+++ b/common/dataStructures/TestSourceType.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/UpdateFileInfoRequest.cpp b/common/dataStructures/UpdateFileInfoRequest.cpp
index 545f8098bf0d56c6286d31aab57aa9ad4609e17f..a7d408ad4fd53644318b8f75ecc9e844ddb6a7e0 100644
--- a/common/dataStructures/UpdateFileInfoRequest.cpp
+++ b/common/dataStructures/UpdateFileInfoRequest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/UpdateFileInfoRequest.hpp b/common/dataStructures/UpdateFileInfoRequest.hpp
index 2c2ec7d748f9723df14f83e0d8af23b894a1a27d..f293238aac5a17ffeaef06d771b3b9c9a952069d 100644
--- a/common/dataStructures/UpdateFileInfoRequest.hpp
+++ b/common/dataStructures/UpdateFileInfoRequest.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/UpdateFileStorageClassRequest.cpp b/common/dataStructures/UpdateFileStorageClassRequest.cpp
index c31aade064715d0b7c73e93f752c664e8398ae35..9d1382ffed02556ee324908791af3ac77bf756e7 100644
--- a/common/dataStructures/UpdateFileStorageClassRequest.cpp
+++ b/common/dataStructures/UpdateFileStorageClassRequest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/UpdateFileStorageClassRequest.hpp b/common/dataStructures/UpdateFileStorageClassRequest.hpp
index 1d7754af3141dfbe2ba8f3fd6394cc51c74b008b..710b40d7ed4c84a64ccea6167685cfefb3799585 100644
--- a/common/dataStructures/UpdateFileStorageClassRequest.hpp
+++ b/common/dataStructures/UpdateFileStorageClassRequest.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/VidToTapeMap.hpp b/common/dataStructures/VidToTapeMap.hpp
index dc05eb0b95e2c2f3f64b670e841299ec09b53d84..caa144153c965c41b392a2d4c7e99262688933a6 100644
--- a/common/dataStructures/VidToTapeMap.hpp
+++ b/common/dataStructures/VidToTapeMap.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/VirtualOrganization.cpp b/common/dataStructures/VirtualOrganization.cpp
index c33fe0f7bb0a6fbd29cc075658012aac7452b888..0fc038d005bee2b27e35d05d1c64b113595f9bd7 100644
--- a/common/dataStructures/VirtualOrganization.cpp
+++ b/common/dataStructures/VirtualOrganization.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/VirtualOrganization.hpp b/common/dataStructures/VirtualOrganization.hpp
index 6f0074156684d76274a47d6544b6d65352070083..df28140a35e7e4804d287a398351046e4576214d 100644
--- a/common/dataStructures/VirtualOrganization.hpp
+++ b/common/dataStructures/VirtualOrganization.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/WriteTestResult.cpp b/common/dataStructures/WriteTestResult.cpp
index 11b2ace8b168045c126cbca230a69ad2d9f833cf..0d05d3ab56cdee91b2b8cd50d5fb289fa4178dcd 100644
--- a/common/dataStructures/WriteTestResult.cpp
+++ b/common/dataStructures/WriteTestResult.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/WriteTestResult.hpp b/common/dataStructures/WriteTestResult.hpp
index 10ede6c63caaa10ae166c28460e9802f2f9634ba..2cefe50692c5bcbd7f275eabc8816ebe5abb6908 100644
--- a/common/dataStructures/WriteTestResult.hpp
+++ b/common/dataStructures/WriteTestResult.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/utils.cpp b/common/dataStructures/utils.cpp
index 17df2bcd7a434e63ca80d0b8ba195e13fcf34eb1..b2bfb35b8884ac3fc72099d48cc96de5768b3f5a 100644
--- a/common/dataStructures/utils.cpp
+++ b/common/dataStructures/utils.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/dataStructures/utils.hpp b/common/dataStructures/utils.hpp
index 5db4db9c75ebadfe577b7cb290edb8d9f48b6d0c..73198df6438dab634e342664e6e72c9c9f0586d8 100644
--- a/common/dataStructures/utils.hpp
+++ b/common/dataStructures/utils.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/AcceptConnectionInterrupted.cpp b/common/exception/AcceptConnectionInterrupted.cpp
index 4eaa41a8e8e3b4a5142857a20386955c005b5625..e84d70dbf1d14789ce3c3ad6ffabed575bc1e083 100644
--- a/common/exception/AcceptConnectionInterrupted.cpp
+++ b/common/exception/AcceptConnectionInterrupted.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/AcceptConnectionInterrupted.hpp b/common/exception/AcceptConnectionInterrupted.hpp
index 4e3d67022d62f6c26b53c8932fb61c5a53dd8f7c..9390bc8c84901296fcc456e246403c91d4fe99f0 100644
--- a/common/exception/AcceptConnectionInterrupted.hpp
+++ b/common/exception/AcceptConnectionInterrupted.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/AcsQueryVolumeCmd.cpp b/common/exception/AcsQueryVolumeCmd.cpp
index b81f4e0c965888ca4b39b232da37cea86c9effa6..8e9d92e45d13afc39bb61ae7bba08f81f4395405 100644
--- a/common/exception/AcsQueryVolumeCmd.cpp
+++ b/common/exception/AcsQueryVolumeCmd.cpp
@@ -1,7 +1,7 @@
 
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/AcsQueryVolumeCmd.hpp b/common/exception/AcsQueryVolumeCmd.hpp
index 3656d5b3fa5f0b0f3b4d3feae4e73c5daef60377..089abc4869d114a0f101e1a780dd1c73fb0b37bd 100644
--- a/common/exception/AcsQueryVolumeCmd.hpp
+++ b/common/exception/AcsQueryVolumeCmd.hpp
@@ -1,7 +1,7 @@
 
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/Backtrace.cpp b/common/exception/Backtrace.cpp
index 339e7df7abd8c3d93d1c689cb602c2f93cb27c18..271af364c9432f58d7ce20cf170e54a3b45fe764 100644
--- a/common/exception/Backtrace.cpp
+++ b/common/exception/Backtrace.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/Backtrace.hpp b/common/exception/Backtrace.hpp
index a1dd59d32517f51c32747781b3a73454566935c2..ba69ff24506578de8ecfd435ad266462ba35e1e3 100644
--- a/common/exception/Backtrace.hpp
+++ b/common/exception/Backtrace.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/BadAlloc.cpp b/common/exception/BadAlloc.cpp
index 7440bb18d451df0f60733035742670f9f4f64f83..eb8118630280b2732a7d2d38cffe259b0282dfa4 100644
--- a/common/exception/BadAlloc.cpp
+++ b/common/exception/BadAlloc.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/BadAlloc.hpp b/common/exception/BadAlloc.hpp
index 005f75b5a357aaa38d3b4e790d289cf39893db69..0547ccce0d165954c45e223788b7753758110d53 100644
--- a/common/exception/BadAlloc.hpp
+++ b/common/exception/BadAlloc.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/ChecksumBlobSizeMismatch.hpp b/common/exception/ChecksumBlobSizeMismatch.hpp
index 085faf576f55cf4177688ad79d8e8c3d72f35bb2..8e90c0346b31bab47caee23f67d5ff0e0cf10d8b 100644
--- a/common/exception/ChecksumBlobSizeMismatch.hpp
+++ b/common/exception/ChecksumBlobSizeMismatch.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/ChecksumTypeMismatch.hpp b/common/exception/ChecksumTypeMismatch.hpp
index cb056446d241329c96133f08578d80af69cbb24b..db9e153f0d359464d93de50191406222cd502ef5 100644
--- a/common/exception/ChecksumTypeMismatch.hpp
+++ b/common/exception/ChecksumTypeMismatch.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/ChecksumValueMismatch.hpp b/common/exception/ChecksumValueMismatch.hpp
index 9618c99d21f6f103cb86ec816613b1e9bbf9bbf6..84a22ba174195946ed44dbc2d46c7cf1d7956dd9 100644
--- a/common/exception/ChecksumValueMismatch.hpp
+++ b/common/exception/ChecksumValueMismatch.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/CommandLineNotParsed.cpp b/common/exception/CommandLineNotParsed.cpp
index 4a1a3037e984689b2d707c716452738fbf160911..ed707ac5ec15b54438f488d71558d50a50729822 100644
--- a/common/exception/CommandLineNotParsed.cpp
+++ b/common/exception/CommandLineNotParsed.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/CommandLineNotParsed.hpp b/common/exception/CommandLineNotParsed.hpp
index 4b7a463f9ae6e1df46ce7fcde7a4c5fe3fe8b361..5e9e7dfb40503dd761dc53784c2edc90e6fccd36 100644
--- a/common/exception/CommandLineNotParsed.hpp
+++ b/common/exception/CommandLineNotParsed.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/DismountFailed.cpp b/common/exception/DismountFailed.cpp
index c5580a28240f0dc56eecb00f5adc6b976f062319..b238485d829b2760f1d0f59b0748d1bed9ec4289 100644
--- a/common/exception/DismountFailed.cpp
+++ b/common/exception/DismountFailed.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/DismountFailed.hpp b/common/exception/DismountFailed.hpp
index 314c82ff49d8099b63f6a53a50be51774b7b3986..61af8418529559da6c55fbc857ede9dff9823027 100644
--- a/common/exception/DismountFailed.hpp
+++ b/common/exception/DismountFailed.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/EndOfFile.hpp b/common/exception/EndOfFile.hpp
index 24848290990c0081b3ff20fa0a76a7d394e9dd78..7c96f44ab9df7851a3ef38ccbf046eec6128d208 100644
--- a/common/exception/EndOfFile.hpp
+++ b/common/exception/EndOfFile.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/Errnum.cpp b/common/exception/Errnum.cpp
index 9b8f7f0432c8fe719aedb1d7b16bfd8eac8c6c2f..f5c0aa3f8e95d4de8c1224e6917ad5fa4ac84441 100644
--- a/common/exception/Errnum.cpp
+++ b/common/exception/Errnum.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/Errnum.hpp b/common/exception/Errnum.hpp
index bff5235a5675ab1794b9b0dbcd6d4e7c483b5889..a3c8047e86706f1a9a84aba7ea410ee147599cee 100644
--- a/common/exception/Errnum.hpp
+++ b/common/exception/Errnum.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/Exception.cpp b/common/exception/Exception.cpp
index 0f91d23dc78347fa28d85d0efc9477779db81b7a..f501944a966bca88159f844c9864b3ae078f8958 100644
--- a/common/exception/Exception.cpp
+++ b/common/exception/Exception.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/Exception.hpp b/common/exception/Exception.hpp
index 29909e2e90e3592c8920ae1043641d1a83f68988..af6313fcf47b548ae097940c5c7a86a4732ead16 100644
--- a/common/exception/Exception.hpp
+++ b/common/exception/Exception.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/ExceptionTest.cpp b/common/exception/ExceptionTest.cpp
index 7ce285398e086526c75f96ca2c785f7dcf5cd739..58519cfdba9aa428a690934ef5fe3ccf594a6c27 100644
--- a/common/exception/ExceptionTest.cpp
+++ b/common/exception/ExceptionTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/FileSizeMismatch.hpp b/common/exception/FileSizeMismatch.hpp
index 07483fac5f9e44fe0ef1ceccb869fd54151dfb28..642be3db44cd7b0c82b0b34bd840f847c46783ff 100644
--- a/common/exception/FileSizeMismatch.hpp
+++ b/common/exception/FileSizeMismatch.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/ForceDismountFailed.cpp b/common/exception/ForceDismountFailed.cpp
index 1b98650a02b6828fa859fe426b4af9cc4678f549..79daaff90c6b70a97526117809f336754be773ba 100644
--- a/common/exception/ForceDismountFailed.cpp
+++ b/common/exception/ForceDismountFailed.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/ForceDismountFailed.hpp b/common/exception/ForceDismountFailed.hpp
index c361dd19848ae53246ec1b6e30d98a31a66ef779..829b63f6cf4483d3ba967b4c4e7a77d84759aeae 100644
--- a/common/exception/ForceDismountFailed.hpp
+++ b/common/exception/ForceDismountFailed.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/InvalidArgument.cpp b/common/exception/InvalidArgument.cpp
index 322efa4010ebdefef8b668a31dc2e8554693e0b3..42df79a9f7093b411fef851f78a0fcd9d4115b98 100644
--- a/common/exception/InvalidArgument.cpp
+++ b/common/exception/InvalidArgument.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/InvalidArgument.hpp b/common/exception/InvalidArgument.hpp
index 059012d43fd34b93614d8a1e55e6cc159077fb66..a00e79bdea7b48bd5965503583cf69a9ac14983b 100644
--- a/common/exception/InvalidArgument.hpp
+++ b/common/exception/InvalidArgument.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/InvalidConfigEntry.cpp b/common/exception/InvalidConfigEntry.cpp
index 4c15acc8064880e1429cfd6c233dd3be94b316f3..f9352de81209f200719971018d533030b3adf450 100644
--- a/common/exception/InvalidConfigEntry.cpp
+++ b/common/exception/InvalidConfigEntry.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/InvalidConfigEntry.hpp b/common/exception/InvalidConfigEntry.hpp
index 9924b0d7f96aeb6730e1c344d347bb2af17a34cd..243a878138c4ee270cffa31a9d03a0f5a14c46f2 100644
--- a/common/exception/InvalidConfigEntry.hpp
+++ b/common/exception/InvalidConfigEntry.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/LostDatabaseConnection.cpp b/common/exception/LostDatabaseConnection.cpp
index f2d3b5f7431be912c063db05324ce10dcbc3f0bb..128f3ea2b6538be095bc6af8e46d8be1cd249716 100644
--- a/common/exception/LostDatabaseConnection.cpp
+++ b/common/exception/LostDatabaseConnection.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/LostDatabaseConnection.hpp b/common/exception/LostDatabaseConnection.hpp
index 1265f6b69139c4952b7d5283c5faca7633f7d7a3..a1a744688680a831347a91019f0ab13a52e21fea 100644
--- a/common/exception/LostDatabaseConnection.hpp
+++ b/common/exception/LostDatabaseConnection.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/MemException.hpp b/common/exception/MemException.hpp
index c1430436646cebcf6d04bf130ce2c4e1c44fb58b..b5dcd43ffc753e51a2863b205e6b7aa5451c8738 100644
--- a/common/exception/MemException.hpp
+++ b/common/exception/MemException.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/Mismatch.cpp b/common/exception/Mismatch.cpp
index 470ed0d56a766e25d755fa11ebba3d7aec51d7ff..c9182f407d61f34836904fbbc15aca47dd3c39fe 100644
--- a/common/exception/Mismatch.cpp
+++ b/common/exception/Mismatch.cpp
@@ -1,7 +1,7 @@
 
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/Mismatch.hpp b/common/exception/Mismatch.hpp
index dafd16c043b98af16e8355378898385d56ac44aa..9c741e20d2d388704148869a73f1b50768595452 100644
--- a/common/exception/Mismatch.hpp
+++ b/common/exception/Mismatch.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/MissingOperand.cpp b/common/exception/MissingOperand.cpp
index f79c21809ec96b685999a6aade8f759e07782fac..d42acddbb0094a608705be71ca1aaaaecf49fd25 100644
--- a/common/exception/MissingOperand.cpp
+++ b/common/exception/MissingOperand.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/MissingOperand.hpp b/common/exception/MissingOperand.hpp
index 1247ea2e9eb5d9a95bfd6712ca2d15f99fe79be6..3821edc347084647b3545214f425a5e1b26cea05 100644
--- a/common/exception/MissingOperand.hpp
+++ b/common/exception/MissingOperand.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/MountFailed.cpp b/common/exception/MountFailed.cpp
index de6bab5c8f73f4750366dbdf4a43e579bf9857eb..c8a935e5253e8d5addd5e97c16a67e8c1df6eb65 100644
--- a/common/exception/MountFailed.cpp
+++ b/common/exception/MountFailed.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/MountFailed.hpp b/common/exception/MountFailed.hpp
index accaea09414799a16d8eb103c0adfdbcc46b1f44..17df7d2d3fe3f0158ce2e9dbf2c9ac49ddfeeaa6 100644
--- a/common/exception/MountFailed.hpp
+++ b/common/exception/MountFailed.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/NoEntry.cpp b/common/exception/NoEntry.cpp
index 810130fd60a9c1063f57bba50fecbe92ae63654c..40711d6abc3ccced45242829b7caad3989e5b0ac 100644
--- a/common/exception/NoEntry.cpp
+++ b/common/exception/NoEntry.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/NoEntry.hpp b/common/exception/NoEntry.hpp
index 5cdb4828c1200b7ec12edee90e61cb6e94f1dd7e..c292394ece557173787d287bde2962c707915c45 100644
--- a/common/exception/NoEntry.hpp
+++ b/common/exception/NoEntry.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/NoPortInRange.cpp b/common/exception/NoPortInRange.cpp
index c62382be606dea5ac11b97123dafe96af1b32143..7296834b169d63d56dab69dbb77e27c092e19b93 100644
--- a/common/exception/NoPortInRange.cpp
+++ b/common/exception/NoPortInRange.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/NoPortInRange.hpp b/common/exception/NoPortInRange.hpp
index d8b488d8e62e2b7d8bff123501c2028fc8f29adb..ebe46f421c57157de266728404773a9a9c4d4b89 100644
--- a/common/exception/NoPortInRange.hpp
+++ b/common/exception/NoPortInRange.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/NonRetryableError.cpp b/common/exception/NonRetryableError.cpp
index e855e001bca33bdb719ffb4dfb8deb23c9e0b780..184818ba87f9c0a3d5e24ccb5b351cf8d595a46e 100644
--- a/common/exception/NonRetryableError.cpp
+++ b/common/exception/NonRetryableError.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/NonRetryableError.hpp b/common/exception/NonRetryableError.hpp
index aee6ac8da966fe11d8dbfb7b74eb9a216ea52fcf..a10db4a58cd28a8aee2a41119f32182dfb332fc4 100644
--- a/common/exception/NonRetryableError.hpp
+++ b/common/exception/NonRetryableError.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/NotAnOwner.cpp b/common/exception/NotAnOwner.cpp
index 9b5936d3e52790df83665bc8afb64c1c3d3d599c..8bf4270cbf4bd2412e1e8575924d24a17630e30e 100644
--- a/common/exception/NotAnOwner.cpp
+++ b/common/exception/NotAnOwner.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/NotAnOwner.hpp b/common/exception/NotAnOwner.hpp
index 67139ef134199df92b78077c100028b60d497af7..a223340eb44474efa3582fc8f89bac6a82c8d470 100644
--- a/common/exception/NotAnOwner.hpp
+++ b/common/exception/NotAnOwner.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/OutOfMemory.cpp b/common/exception/OutOfMemory.cpp
index 5a97025de8b5b23b96eca61167161b8ef2a1496f..6d283bcc31c5a0b11c4b2bdc6724c0ba7c1557c0 100644
--- a/common/exception/OutOfMemory.cpp
+++ b/common/exception/OutOfMemory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/OutOfMemory.hpp b/common/exception/OutOfMemory.hpp
index ec9875c3620e18a658d4403fb26ef555693a03ca..ef0f7932c8725f32d272b85f1f788180ecded25d 100644
--- a/common/exception/OutOfMemory.hpp
+++ b/common/exception/OutOfMemory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/QueryVolumeFailed.cpp b/common/exception/QueryVolumeFailed.cpp
index c7bfd38a2dc0c027f65df6b3c6f66fea55d462e2..4ae023ce15d44ee2230dacafd55917b5baa36d42 100644
--- a/common/exception/QueryVolumeFailed.cpp
+++ b/common/exception/QueryVolumeFailed.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/QueryVolumeFailed.hpp b/common/exception/QueryVolumeFailed.hpp
index 642fa7ba4e7b691e5926298b08be091a50ee28b9..898d8f8e82a8ca984f8c001da929ad00f312cf3b 100644
--- a/common/exception/QueryVolumeFailed.hpp
+++ b/common/exception/QueryVolumeFailed.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/RequestFailed.cpp b/common/exception/RequestFailed.cpp
index 53b68c6747234b73729cd71d7a07f9943e12f2d8..e36fcaf906a79e8952078c92d9a00a279c035a9b 100644
--- a/common/exception/RequestFailed.cpp
+++ b/common/exception/RequestFailed.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/RequestFailed.hpp b/common/exception/RequestFailed.hpp
index 7491f470a746a2b1be4cd836e090b2899e605ed1..5e2f4a1f806a6f9870bc91fe295ebf024681d489 100644
--- a/common/exception/RequestFailed.hpp
+++ b/common/exception/RequestFailed.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/RetryableError.cpp b/common/exception/RetryableError.cpp
index a4c86c0b3e31890713236f41385962c92b7ee793..8f133578efd06cc0833c1f4dd24301390189d525 100644
--- a/common/exception/RetryableError.cpp
+++ b/common/exception/RetryableError.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/RetryableError.hpp b/common/exception/RetryableError.hpp
index 57473c2e93f0711a97d8b06e3a2a8cc1ed2feeb1..b1970921b701e15ee5e69216c77d684471723975 100644
--- a/common/exception/RetryableError.hpp
+++ b/common/exception/RetryableError.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/TapeFseqMismatch.hpp b/common/exception/TapeFseqMismatch.hpp
index 80531ef1c424b6f3808131decb838264bf288f0a..104623f510dc9b334a622089cc16377833b9b5b7 100644
--- a/common/exception/TapeFseqMismatch.hpp
+++ b/common/exception/TapeFseqMismatch.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/TimeOut.cpp b/common/exception/TimeOut.cpp
index d85bb45fb248aafac5384058a7b75e8ef401b52f..7335c12871ec042d22e8edbba0a4be440d21ae92 100644
--- a/common/exception/TimeOut.cpp
+++ b/common/exception/TimeOut.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/TimeOut.hpp b/common/exception/TimeOut.hpp
index 34687ed364ec4d8030a6ccd960fe72a7558861e9..5bb12e63a85bfcd9dabcd5daf11574327445138f 100644
--- a/common/exception/TimeOut.hpp
+++ b/common/exception/TimeOut.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/UserError.cpp b/common/exception/UserError.cpp
index 6e0abb9e604c6a74f948a3f94809be2353883ebd..4982f040dbcfd8ae3511ba4d622c7dd7ff671efe 100644
--- a/common/exception/UserError.cpp
+++ b/common/exception/UserError.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/UserError.hpp b/common/exception/UserError.hpp
index 4c65d83b9478f1ad3956a0803b9aaa535e89781a..9478b39579ee1819f19971cdb07cb0348af40286 100644
--- a/common/exception/UserError.hpp
+++ b/common/exception/UserError.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/UserErrorWithCacheInfo.hpp b/common/exception/UserErrorWithCacheInfo.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..6c7649d337f8776fd2f9678818da213c8b529be7
--- /dev/null
+++ b/common/exception/UserErrorWithCacheInfo.hpp
@@ -0,0 +1,50 @@
+/*
+ * @project        The CERN Tape Archive (CTA)
+ * @copyright      Copyright(C) 2015-2021 CERN
+ * @license        This program is free software: you can redistribute it and/or modify
+ *                 it under the terms of the GNU General Public License as published by
+ *                 the Free Software Foundation, either version 3 of the License, or
+ *                 (at your option) any later version.
+ *
+ *                 This program is distributed in the hope that it will be useful,
+ *                 but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *                 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *                 GNU General Public License for more details.
+ *
+ *                 You should have received a copy of the GNU General Public License
+ *                 along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "common/exception/UserError.hpp"
+
+namespace cta {
+namespace exception {
+
+/**
+ * A user error together with information about how the respective cached
+ * value was obtained.
+ */
+class UserErrorWithCacheInfo : public exception::UserError {
+public:
+  std::string cacheInfo;
+
+  /**
+   * Constructor.
+   *
+   * @param cInfo Information about how the respective cached value was
+   * obtained.
+   * @param context optional context string added to the message
+   * at initialisation time.
+   * @param embedBacktrace whether to embed a backtrace of where the
+   * exception was throw in the message
+   */
+  UserErrorWithCacheInfo(const std::string &cInfo, const std::string &context = "", const bool embedBacktrace = true):
+    UserError(context, embedBacktrace),
+    cacheInfo(cInfo) {
+  }
+}; // class UserErrorWithTimeBasedCacheInfo
+
+} // namespace exception
+} // namespace cta
diff --git a/common/exception/XrootCl.cpp b/common/exception/XrootCl.cpp
index 6bb261b1876c37317d341681a4a06f6ce996d04c..5e97f50f03ef45a093632c84d7fb98e71a64b36e 100644
--- a/common/exception/XrootCl.cpp
+++ b/common/exception/XrootCl.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/exception/XrootCl.hpp b/common/exception/XrootCl.hpp
index 80f6bafa62419f52dfcc7b836c8d8410f826348a..72a2b9600bf2705949ff4923457b9418a2fb1a18 100644
--- a/common/exception/XrootCl.hpp
+++ b/common/exception/XrootCl.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/helgrind_annotator.hpp b/common/helgrind_annotator.hpp
index cbc6e738be502cd9733302120c84bcbcc8cc980e..f0c83190de88ddfb5cd2aefb57b0742d1b133017 100644
--- a/common/helgrind_annotator.hpp
+++ b/common/helgrind_annotator.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/json/object/JSONCObject.cpp b/common/json/object/JSONCObject.cpp
index d0f62dfa0dd0ead35b741e3cd7019309bd042344..1f32e02389c43adbf593e6628896cd473ca8910c 100644
--- a/common/json/object/JSONCObject.cpp
+++ b/common/json/object/JSONCObject.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/json/object/JSONCObject.hpp b/common/json/object/JSONCObject.hpp
index 481bc95032c63beee7f22fbcbf7d911b89645f55..15c39023126761dec2200813321e36cd29df0884 100644
--- a/common/json/object/JSONCObject.hpp
+++ b/common/json/object/JSONCObject.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/json/object/JSONObject.cpp b/common/json/object/JSONObject.cpp
index 9d71276bb7cfd639adf180db8daf19b483dbdb96..a7666fe964ddc50dd4f7bf5de751579a7af9d9c3 100644
--- a/common/json/object/JSONObject.cpp
+++ b/common/json/object/JSONObject.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/json/object/JSONObject.hpp b/common/json/object/JSONObject.hpp
index 3b536fe532f30a017df6d17e6e892716e93ee8d5..17f2c19d7261a85186f7dd3eb04328495eba6f73 100644
--- a/common/json/object/JSONObject.hpp
+++ b/common/json/object/JSONObject.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/json/object/JSONObjectException.hpp b/common/json/object/JSONObjectException.hpp
index 36c1f46d92cbea6a0a669f7d378eeb2fd5968619..20dd2afb65bf16498ff2c0ffd76a7277d63440a3 100644
--- a/common/json/object/JSONObjectException.hpp
+++ b/common/json/object/JSONObjectException.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/json/test/JSONCObjectTest.cpp b/common/json/test/JSONCObjectTest.cpp
index c75861c1b36e923d8e822334a3bbf595282bcea2..78dcddbf8ddcf21e2651e7d6772a49a7da3d42e1 100644
--- a/common/json/test/JSONCObjectTest.cpp
+++ b/common/json/test/JSONCObjectTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/json/test/JSONCTestObject.cpp b/common/json/test/JSONCTestObject.cpp
index 7d413db8ea027ddcc0b78af2438495afee79fee4..ce2cdafd455dfe119feddb60d6416091fcf252cf 100644
--- a/common/json/test/JSONCTestObject.cpp
+++ b/common/json/test/JSONCTestObject.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/json/test/JSONCTestObject.hpp b/common/json/test/JSONCTestObject.hpp
index 3d533d0c1653e76326c701d68e18b8936c4353e9..825446532c571877a1e1b0d96ff25cfb02662c10 100644
--- a/common/json/test/JSONCTestObject.hpp
+++ b/common/json/test/JSONCTestObject.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/json/test/TestObject.hpp b/common/json/test/TestObject.hpp
index 170789df5a22506d045558afaab110a97a287604..f7d22cebdfc1cd3487e3efdd3622b52cb5394aec 100644
--- a/common/json/test/TestObject.hpp
+++ b/common/json/test/TestObject.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/Constants.hpp b/common/log/Constants.hpp
index d3c85d0c3c158627d1fc281d45cf3cc54e4bfc57..2664acb9bf9f82fe973eca8d0f6d475339f23431 100644
--- a/common/log/Constants.hpp
+++ b/common/log/Constants.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/DummyLogger.cpp b/common/log/DummyLogger.cpp
index d1a427c07c82ab553ead58a5eb56b098d13c1525..71ff0e3a2ef11ab4a61d2003d6a767addf2ce379 100644
--- a/common/log/DummyLogger.cpp
+++ b/common/log/DummyLogger.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/DummyLogger.hpp b/common/log/DummyLogger.hpp
index 66e48e098428313606f1d2accaa49166cd9733f2..fd6c487d9bdd633603913c8b02e406a66a363fc6 100644
--- a/common/log/DummyLogger.hpp
+++ b/common/log/DummyLogger.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/FileLogger.cpp b/common/log/FileLogger.cpp
index fcb9d507ea9d46c25e1bb839288bf8cbd1374485..6e9ebcf6e4baf255e71e17b71cbdacc81b271d38 100644
--- a/common/log/FileLogger.cpp
+++ b/common/log/FileLogger.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/FileLogger.hpp b/common/log/FileLogger.hpp
index c8671b5fb1f61b65e97b8e3d4f9f6ad6458f096e..d59fb010362a88dafdb19f1f064452823f344a12 100644
--- a/common/log/FileLogger.hpp
+++ b/common/log/FileLogger.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/FileLoggerTest.cpp b/common/log/FileLoggerTest.cpp
index 871b8184c47ac743fbf5ee966f9f5d0b675ffc16..2553d2dc118c7c23df21da2c55f948a010b3662e 100644
--- a/common/log/FileLoggerTest.cpp
+++ b/common/log/FileLoggerTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/IPAddress.hpp b/common/log/IPAddress.hpp
index 8871a34348d07e813aa3cacc197d4bbc6932b85d..69c30ef7863ee77856162102b68a847bb50c95e9 100644
--- a/common/log/IPAddress.hpp
+++ b/common/log/IPAddress.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/LogContext.cpp b/common/log/LogContext.cpp
index 609b156d2004971b887e3e7acaa4ee011c58ab86..df8ef9c3d4b681dafc54045bd05f097d8d26bc79 100644
--- a/common/log/LogContext.cpp
+++ b/common/log/LogContext.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/LogContext.hpp b/common/log/LogContext.hpp
index 0a8fc3b93c9babf364e4abdde6ddee4e806dd140..0b0ab1568fccc9ccedcc6a66e835cf4f82dcf056 100644
--- a/common/log/LogContext.hpp
+++ b/common/log/LogContext.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/LogContextTest.cpp b/common/log/LogContextTest.cpp
index 84fd3ac066a2f3aabc0ffbe9935c0dd269109889..ed6e16da8f540c0a80fcc533546b5bb290e4879d 100644
--- a/common/log/LogContextTest.cpp
+++ b/common/log/LogContextTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/LogLevel.cpp b/common/log/LogLevel.cpp
index eef3ddb9a07f8ebddbdb805e0d980ec17344f751..941e21e6276833b5677f3369cdc2b29c8fca90c1 100644
--- a/common/log/LogLevel.cpp
+++ b/common/log/LogLevel.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/LogLevel.hpp b/common/log/LogLevel.hpp
index 55dcd3bbae8504adadf843f6e6c82f3a68278cbd..ce37c1a8d8e953ec92cfeef3a18e6d89364bab47 100644
--- a/common/log/LogLevel.hpp
+++ b/common/log/LogLevel.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/LogLevelTest.cpp b/common/log/LogLevelTest.cpp
index cde27645648a9be7cf3faa31fbadf8d2493315b7..35b2f1fff9b3090f8f460723d478a9fbf5babdca 100644
--- a/common/log/LogLevelTest.cpp
+++ b/common/log/LogLevelTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/Logger.cpp b/common/log/Logger.cpp
index 3286adc111d1f730db7712746cf887e4e2d6e9bd..b0eaa138d71b0e20117ca4b7f2c2e6bdaeb797ca 100644
--- a/common/log/Logger.cpp
+++ b/common/log/Logger.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/Logger.hpp b/common/log/Logger.hpp
index fc49f8eb09796a8d2b521ef2593ce9c7aba4db25..ad23225d2e3467c7b5276493c7dab70a0317c4bd 100644
--- a/common/log/Logger.hpp
+++ b/common/log/Logger.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/Message.cpp b/common/log/Message.cpp
index b7f4166b586b852cb0ebe672362fefcbfc4fa883..6c8c152f924d5b896a80eb0f172209ab3ddacc78 100644
--- a/common/log/Message.cpp
+++ b/common/log/Message.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/Message.hpp b/common/log/Message.hpp
index fc38d4f578212f0b4252b4b47c953f1389250085..8980075e3fb5f1bf64e9ec2500989fbc330911f5 100644
--- a/common/log/Message.hpp
+++ b/common/log/Message.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/Param.cpp b/common/log/Param.cpp
index baceb3b987041ad2b5addb4cf2dcb88551ce937d..b7adbd247cbd0ed01fcfe48e0f1ccd34689d0358 100644
--- a/common/log/Param.cpp
+++ b/common/log/Param.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/Param.hpp b/common/log/Param.hpp
index 03c01dd15667eaad07d8e83b1e759605d465a1a2..a31df44e22909e755e86989af3913ee63084043a 100644
--- a/common/log/Param.hpp
+++ b/common/log/Param.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/ParamTest.cpp b/common/log/ParamTest.cpp
index 15988a59a132b4f2ebe9d4cf65bda01693165bdb..d85b016efbb7b9d9c8838088a697e7ac4525bece 100644
--- a/common/log/ParamTest.cpp
+++ b/common/log/ParamTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/PriorityMaps.cpp b/common/log/PriorityMaps.cpp
index d5ade692e604093957af7ef476cb0b5776c94646..4df4600f24e1253d2ed302870be544e856a0e35a 100644
--- a/common/log/PriorityMaps.cpp
+++ b/common/log/PriorityMaps.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/PriorityMaps.hpp b/common/log/PriorityMaps.hpp
index 81beb6a57d2be1b03d22bdaea2fbb0645a5510b4..f34cc8e6db59224960a66a7c8be2c92f1522e30e 100644
--- a/common/log/PriorityMaps.hpp
+++ b/common/log/PriorityMaps.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/StdoutLogger.cpp b/common/log/StdoutLogger.cpp
index 6533bafae114354846629516349113f5e34aa35b..609a999683b79a9a91bbb49d7f234b17063d6f68 100644
--- a/common/log/StdoutLogger.cpp
+++ b/common/log/StdoutLogger.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/StdoutLogger.hpp b/common/log/StdoutLogger.hpp
index 4b404cb1962463b0de1d80947e12a91ce7a74f75..76d9aa9ba1ff05f9e70b28fab5cd030b571f08fa 100644
--- a/common/log/StdoutLogger.hpp
+++ b/common/log/StdoutLogger.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/StringLogger.cpp b/common/log/StringLogger.cpp
index 04edafe2f916567b037ff5fb8b812640344e5e49..161e4f242410e24e1341666d7c52b2ab5d4621da 100644
--- a/common/log/StringLogger.cpp
+++ b/common/log/StringLogger.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/StringLogger.hpp b/common/log/StringLogger.hpp
index 9bc9e830b7fc5f1ddcb903cab83a0afab848cf42..8d9ec1d0736b0138dc87caab2cb7841a91d770f9 100644
--- a/common/log/StringLogger.hpp
+++ b/common/log/StringLogger.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/StringLoggerTest.cpp b/common/log/StringLoggerTest.cpp
index ce1469d0d92a33bedd54cd483a84a307f6343fe8..18159deb6097da474cdc21567d2f12dd2eda03c7 100644
--- a/common/log/StringLoggerTest.cpp
+++ b/common/log/StringLoggerTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/SyslogLogger.cpp b/common/log/SyslogLogger.cpp
index 92ab4bb4d5af79af8eb0a7b4a9769a8cd3890892..cd7cbdfd23e5d56fa19f7b569c22c2d225504009 100644
--- a/common/log/SyslogLogger.cpp
+++ b/common/log/SyslogLogger.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/SyslogLogger.hpp b/common/log/SyslogLogger.hpp
index 4cc9f4afc12382275aae72f2877a96ae9df4599f..3a24081cd777c1065be22e37a1e72145d71fc5d0 100644
--- a/common/log/SyslogLogger.hpp
+++ b/common/log/SyslogLogger.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/SyslogLoggerTest.cpp b/common/log/SyslogLoggerTest.cpp
index 28b78bd78be4381c731fe8e74535f13f34aed594..c5a8d3a8f95d0fdbb4cd4c4f180d4685f93eaa20 100644
--- a/common/log/SyslogLoggerTest.cpp
+++ b/common/log/SyslogLoggerTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/TestingSyslogLogger.hpp b/common/log/TestingSyslogLogger.hpp
index a81636a8190074daac639cc6d5f218f3ebbcbe0d..01e4cb585bd3b39b06e22328a95a8de6a7e48d30 100644
--- a/common/log/TestingSyslogLogger.hpp
+++ b/common/log/TestingSyslogLogger.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/TimeStamp.hpp b/common/log/TimeStamp.hpp
index a15c6787c75ba3d5c860319f52c38a447cf1769c..95ae4582c41063ef1f38d68115a8455086d69240 100644
--- a/common/log/TimeStamp.hpp
+++ b/common/log/TimeStamp.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/TimingList.cpp b/common/log/TimingList.cpp
index 77a283247d2988009f7c4ffe5fdc82a6c5cdaaba..083ed3fdcd02cd05cf8890b638ee3d178bfc4913 100644
--- a/common/log/TimingList.cpp
+++ b/common/log/TimingList.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/TimingList.hpp b/common/log/TimingList.hpp
index c2ffa214eb5594b87172bb12fb1d7e2bd58eb66d..d9ec7c4883aca1e4bf3f194b31c66e414924d57d 100644
--- a/common/log/TimingList.hpp
+++ b/common/log/TimingList.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/log.cpp b/common/log/log.cpp
index 6b6362dd05953c0e4abeedf5a1b3a7a3cf428284..6db9dd96606e80468493d6a27cd1709ce6209a98 100644
--- a/common/log/log.cpp
+++ b/common/log/log.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/log/log.hpp b/common/log/log.hpp
index c8ea3d8f412535aff4efc06090da25728dd2a57e..f095ed514f5093f7ffeb081956a81fe9bbd27f6e 100644
--- a/common/log/log.hpp
+++ b/common/log/log.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/make_unique.hpp b/common/make_unique.hpp
index 377409b5c1c223c65d32721eaad7e1375e211fd0..31c4e2de547cc32a1cac1977bcd67414f306d697 100644
--- a/common/make_unique.hpp
+++ b/common/make_unique.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/optional.cpp b/common/optional.cpp
index 1d378aa04a32ff6f772003a2391251fcbb61a4cb..da30ea4da06a75249421635b9c912b36f217cf6d 100644
--- a/common/optional.cpp
+++ b/common/optional.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/optional.hpp b/common/optional.hpp
index 6ed951fb05e5977753f5c122d73a1a7da00dbe1f..65818215b0008c169645cbb48f3d2e68d5f400b4 100644
--- a/common/optional.hpp
+++ b/common/optional.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/optionalTest.cpp b/common/optionalTest.cpp
index 8bfc2e5cc9da839e39e3df10cb69cef65791f066..165a42dea75f6d68194ef460a1d5dab3d688db56 100644
--- a/common/optionalTest.cpp
+++ b/common/optionalTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/priorities/DriveQuota.cpp b/common/priorities/DriveQuota.cpp
index c1843115df048300ec6309d9374e9236b4d88d04..9af880fad24f3a12d7f87952ca5699fc87d755b2 100644
--- a/common/priorities/DriveQuota.cpp
+++ b/common/priorities/DriveQuota.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/priorities/DriveQuota.hpp b/common/priorities/DriveQuota.hpp
index 1771c06bc5eb150a64d5bd6be0c87b6087e92469..dc6a18dce23dfa9c6262e7c6c78da01490d12470 100644
--- a/common/priorities/DriveQuota.hpp
+++ b/common/priorities/DriveQuota.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/priorities/MountCriteria.cpp b/common/priorities/MountCriteria.cpp
index 2cf9c0aa623d5c97039ba94bcff9ebb185e89a8f..c792cff46e120dbd133c83b4b12279c9307eecfb 100644
--- a/common/priorities/MountCriteria.cpp
+++ b/common/priorities/MountCriteria.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/priorities/MountCriteria.hpp b/common/priorities/MountCriteria.hpp
index 4b73e3710449e14892735d0bd842f95eac825e39..10bdc9363a810f525d03b718a5bd4d741e64289e 100644
--- a/common/priorities/MountCriteria.hpp
+++ b/common/priorities/MountCriteria.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/priorities/UserGroup.cpp b/common/priorities/UserGroup.cpp
index 5d1b059098d27bdd2415a06e08dcc3251efc5c3c..10634e6bd1cb0b9022f67f6cad69b21106d1420a 100644
--- a/common/priorities/UserGroup.cpp
+++ b/common/priorities/UserGroup.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/priorities/UserGroup.hpp b/common/priorities/UserGroup.hpp
index 70daaf97034b7d26c24a02733820efaf363aaa71..4433eabe3ed83757e602693aad34f23bfd015b7d 100644
--- a/common/priorities/UserGroup.hpp
+++ b/common/priorities/UserGroup.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/processCap/ProcessCap.cpp b/common/processCap/ProcessCap.cpp
index bdcc87c4a6223c89e07b77515fb21cab9a233a43..7b47ac0b56b4216f22c30beb58bb6133d00dcdd1 100644
--- a/common/processCap/ProcessCap.cpp
+++ b/common/processCap/ProcessCap.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/processCap/ProcessCap.hpp b/common/processCap/ProcessCap.hpp
index 4d2eb74293816107e71c1c6f6ccb61ae6c63ae09..cef8b83272e4ed9ffbd19bc666eddf278da6fb46 100644
--- a/common/processCap/ProcessCap.hpp
+++ b/common/processCap/ProcessCap.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/processCap/ProcessCapDummy.cpp b/common/processCap/ProcessCapDummy.cpp
index c88fe876f969b36d684c999a88ceb6072512f0b7..52e86c36b7ee08409c55553fc77b8269b04808ea 100644
--- a/common/processCap/ProcessCapDummy.cpp
+++ b/common/processCap/ProcessCapDummy.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/processCap/ProcessCapDummy.hpp b/common/processCap/ProcessCapDummy.hpp
index 435c2a6197d66fbea905afeb1f25cf3360d73110..6ebd3ed7bfc95054b1f3c0dd67f29a1f4c8f7dfe 100644
--- a/common/processCap/ProcessCapDummy.hpp
+++ b/common/processCap/ProcessCapDummy.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/processCap/SmartCap.cpp b/common/processCap/SmartCap.cpp
index 17b6f381711f105abc186e853082444cb904094d..d5334f193bcb9719d52fac4a475e8a8db73c26f4 100644
--- a/common/processCap/SmartCap.cpp
+++ b/common/processCap/SmartCap.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/processCap/SmartCap.hpp b/common/processCap/SmartCap.hpp
index 31bfce10a83b21d91cdf8803bab5383f0c837c38..0b00b49b83a7102674f5b2d83cb6a854ea5a98c0 100644
--- a/common/processCap/SmartCap.hpp
+++ b/common/processCap/SmartCap.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/processCap/SmartCapTest.cpp b/common/processCap/SmartCapTest.cpp
index 9ec6dc762ad1010e8361866d2b3245a5ac052f4d..aa380f269631b468370ad5c9cd77c6570da50254 100644
--- a/common/processCap/SmartCapTest.cpp
+++ b/common/processCap/SmartCapTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/range.hpp b/common/range.hpp
index 7ff4eb098931c73c045b83a30f85494b131841bd..34767014763d4eb067bc4361cba12097b1fa5f97 100644
--- a/common/range.hpp
+++ b/common/range.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/rangeTest.cpp b/common/rangeTest.cpp
index 476f185a9649489a51e2bbad18dd4b30158ac42a..c849b4a909c6e5a73e9ddde662d1d0145bf157ea 100644
--- a/common/rangeTest.cpp
+++ b/common/rangeTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/remoteFS/RemoteFileStatus.cpp b/common/remoteFS/RemoteFileStatus.cpp
index 3c59898a76fed84d1cc3f428e22a93b6452b9d99..893538454b4aae35a2f2ea9826ac39709f4329a3 100644
--- a/common/remoteFS/RemoteFileStatus.cpp
+++ b/common/remoteFS/RemoteFileStatus.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/remoteFS/RemoteFileStatus.hpp b/common/remoteFS/RemoteFileStatus.hpp
index 19d0b571d2f5928e84580b250f74233506424f50..4c28318d29a37d44a3bb82e270dbae9de5880557 100644
--- a/common/remoteFS/RemoteFileStatus.hpp
+++ b/common/remoteFS/RemoteFileStatus.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/remoteFS/RemotePath.cpp b/common/remoteFS/RemotePath.cpp
index 7bb99154dbf05fa52e424724f907ee9c3319356c..349a646a69371a44d965285610d7b84d0c6032d0 100644
--- a/common/remoteFS/RemotePath.cpp
+++ b/common/remoteFS/RemotePath.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/remoteFS/RemotePath.hpp b/common/remoteFS/RemotePath.hpp
index 98b87916c5d553e31cc7d347c105da5accf5ad28..e1c2653d66b1c03ddb09ccaec65e40314f0ebd39 100644
--- a/common/remoteFS/RemotePath.hpp
+++ b/common/remoteFS/RemotePath.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/remoteFS/RemotePathAndStatus.cpp b/common/remoteFS/RemotePathAndStatus.cpp
index 120c055765e739d10bc5d2b9c15101e63cc40905..f78b3d78729797c82a91601d4cc083d1553043cf 100644
--- a/common/remoteFS/RemotePathAndStatus.cpp
+++ b/common/remoteFS/RemotePathAndStatus.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/remoteFS/RemotePathAndStatus.hpp b/common/remoteFS/RemotePathAndStatus.hpp
index 339087c9f554966f5fa5f77aeb3542674c387428..f8cb2a214df6db7c61075f771ebc6e7371f18e94 100644
--- a/common/remoteFS/RemotePathAndStatus.hpp
+++ b/common/remoteFS/RemotePathAndStatus.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/remoteFS/RemotePathTest.cpp b/common/remoteFS/RemotePathTest.cpp
index 17cef4f63948a49fbc670ae4c3f7accbc6a2dc57..fdffaaab8fd91802a61d82c2c6036a1a1fab695c 100644
--- a/common/remoteFS/RemotePathTest.cpp
+++ b/common/remoteFS/RemotePathTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/Async.cpp b/common/threading/Async.cpp
index 2f69e86fd693d2b3a5846fe8f82189499634895d..9e826e96b6b0ad4bfc2ff04a056333415fafcb4d 100644
--- a/common/threading/Async.cpp
+++ b/common/threading/Async.cpp
@@ -5,7 +5,7 @@
 
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/Async.hpp b/common/threading/Async.hpp
index e9dab23a21f291c2923e566f63c4a464d25d3b97..bb0b03ffbdec10a7d6b34667bd29e1d303ba1246 100644
--- a/common/threading/Async.hpp
+++ b/common/threading/Async.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -16,7 +16,7 @@
  */
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/AsyncTests.cpp b/common/threading/AsyncTests.cpp
index d35cde728665eaa12f57de2497db710b6c28bbfe..cc455861e5c32bc8426239842af34aaae8d823d8 100644
--- a/common/threading/AsyncTests.cpp
+++ b/common/threading/AsyncTests.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/AtomicCounter.hpp b/common/threading/AtomicCounter.hpp
index 419004d71f1b8055f55647d6139d2d637248e5db..d84c41900ff9a5a7768c83bf0b6ea4d658b1dc24 100644
--- a/common/threading/AtomicCounter.hpp
+++ b/common/threading/AtomicCounter.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/AtomicCounterTest.cpp b/common/threading/AtomicCounterTest.cpp
index 1b0b859b9799056b95ab143dbb28fca9406a6363..f118861881ce3f41169f774d4fa7e8acb66a1507 100644
--- a/common/threading/AtomicCounterTest.cpp
+++ b/common/threading/AtomicCounterTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/AtomicFlag.hpp b/common/threading/AtomicFlag.hpp
index 411631625f62ea9732c9f841d0dce142a3302b2a..ddba58176efef73ce58828c5039400c8e637b807 100644
--- a/common/threading/AtomicFlag.hpp
+++ b/common/threading/AtomicFlag.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/BlockingQueue.hpp b/common/threading/BlockingQueue.hpp
index 735c2b0170719db9af3f48d97afbdc8f468240e1..4fea049a3749ef8dc5c3b5789bf4bf1f25857fa0 100644
--- a/common/threading/BlockingQueue.hpp
+++ b/common/threading/BlockingQueue.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/ChildProcess.cpp b/common/threading/ChildProcess.cpp
index 7a685e43026fe0f845682e2d0b25aff47c90c5d7..20aeeba9bd556b4ac52b43a28d1c4cafd4f664f5 100644
--- a/common/threading/ChildProcess.cpp
+++ b/common/threading/ChildProcess.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/ChildProcess.hpp b/common/threading/ChildProcess.hpp
index d7f71cd9511e8026523dd48e8cf7251be9326562..77d0886da04744afd0f507a93e363fd8dd780c09 100644
--- a/common/threading/ChildProcess.hpp
+++ b/common/threading/ChildProcess.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/CondVar.cpp b/common/threading/CondVar.cpp
index 219862bdb57cc6bc5bff6d2cc21017789302a448..fd3cae85c8fa0a40cb3f4f8cb8a1478ba7b188b3 100644
--- a/common/threading/CondVar.cpp
+++ b/common/threading/CondVar.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/CondVar.hpp b/common/threading/CondVar.hpp
index 53b750221e5f06a5991bf2d4f6ee4f249bbb3cba..a59f76e4a427e98d7d185871025871be5e4b7be2 100644
--- a/common/threading/CondVar.hpp
+++ b/common/threading/CondVar.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/CondVarTest.cpp b/common/threading/CondVarTest.cpp
index 5c4a8206a3d414ceffe1fe6e16c47fb2f11da1c4..14f89a77fcfdc92397b8137352df7373736c15cb 100644
--- a/common/threading/CondVarTest.cpp
+++ b/common/threading/CondVarTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/Daemon.cpp b/common/threading/Daemon.cpp
index b43a01f6003024368dd4a5e14351b1a277a3968f..573ef5ac377be26a29308519e6f8f3f542e069fd 100644
--- a/common/threading/Daemon.cpp
+++ b/common/threading/Daemon.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/Daemon.hpp b/common/threading/Daemon.hpp
index 4bc41e82ea24c096a679c9b34c43597f654b9bb7..056202044a66f1429441edff9993205307822f40 100644
--- a/common/threading/Daemon.hpp
+++ b/common/threading/Daemon.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/DaemonTest.cpp b/common/threading/DaemonTest.cpp
index 38ea6ac6b384fc043b457d2ce443cea7e6fa0bf0..b1b38d136099dd78e0f0118998a1b274e3472bae 100644
--- a/common/threading/DaemonTest.cpp
+++ b/common/threading/DaemonTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/Mutex.cpp b/common/threading/Mutex.cpp
index e8fc868d22909c7626645ad2816e28e43be6e469..510eac599d14d68f29c59f69a065b5f053c733d9 100644
--- a/common/threading/Mutex.cpp
+++ b/common/threading/Mutex.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/Mutex.hpp b/common/threading/Mutex.hpp
index ff7149d5bc74521e8c84ca479f89373837a9e1d2..85befb1955ca559aaac4ac98cb4ebb5dc3833611 100644
--- a/common/threading/Mutex.hpp
+++ b/common/threading/Mutex.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/MutexLocker.hpp b/common/threading/MutexLocker.hpp
index 4543ed43f3efc4cbe7a3ddbe97de26bec9cf3867..e54aac88c00fb711cb585ef2f3ea5dc9f1f5d5d2 100644
--- a/common/threading/MutexLocker.hpp
+++ b/common/threading/MutexLocker.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/MutexLtrace.cpp b/common/threading/MutexLtrace.cpp
index 1149c63e156e125d7e508e13d894109b0c58ffa5..774c84f37b8473414eeed571b30b848165a0b451 100644
--- a/common/threading/MutexLtrace.cpp
+++ b/common/threading/MutexLtrace.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/RWLock.cpp b/common/threading/RWLock.cpp
index 777cc244ca4f933f2468c6ed63451c6629927df8..9eb612d0895fdc244f1c7345a2048ca1b9ed43a9 100644
--- a/common/threading/RWLock.cpp
+++ b/common/threading/RWLock.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/RWLock.hpp b/common/threading/RWLock.hpp
index d87639de09ee3ecec498821ba7de5b2e371926ab..9f5d08368ec2fa8f0b49ff356a79cb39ed44980d 100644
--- a/common/threading/RWLock.hpp
+++ b/common/threading/RWLock.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/RWLockRdLocker.cpp b/common/threading/RWLockRdLocker.cpp
index 65b32d8db2244f0981ae40fb6aea30d99a15a0e8..1ec2be12c65908698cc3440df0b6c2c29964c6c1 100644
--- a/common/threading/RWLockRdLocker.cpp
+++ b/common/threading/RWLockRdLocker.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/RWLockRdLocker.hpp b/common/threading/RWLockRdLocker.hpp
index 1e7c008112d4d5789b4c061a9f55e40fe683635a..8cf4567eb367827fe4470739b8d1fc0d49514f7e 100644
--- a/common/threading/RWLockRdLocker.hpp
+++ b/common/threading/RWLockRdLocker.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/RWLockTest.cpp b/common/threading/RWLockTest.cpp
index 94b98616504551405bb010ed5bad75c3e62d2e52..70ca1fb72a727d95eaa19fea114d41591dbb4ea2 100644
--- a/common/threading/RWLockTest.cpp
+++ b/common/threading/RWLockTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/RWLockWrLocker.cpp b/common/threading/RWLockWrLocker.cpp
index 4ad3851c46daf9f537ab0d4707a5dea49d6ce096..0fd4d3e1c96a5c9c8cfb90e06b18da0bd218e150 100644
--- a/common/threading/RWLockWrLocker.cpp
+++ b/common/threading/RWLockWrLocker.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/RWLockWrLocker.hpp b/common/threading/RWLockWrLocker.hpp
index f2c3d25a5197ea29f613c1e4b9d846e0cb18c4a0..57265596d58a3afd8790d00e2d4bbf66218b6526 100644
--- a/common/threading/RWLockWrLocker.hpp
+++ b/common/threading/RWLockWrLocker.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/Semaphores.cpp b/common/threading/Semaphores.cpp
index a28d7f46b60f10b855fa1c3cc13ee2653838d328..08056876ab9032e71d652ec595fae3a12cb9d141 100644
--- a/common/threading/Semaphores.cpp
+++ b/common/threading/Semaphores.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/Semaphores.hpp b/common/threading/Semaphores.hpp
index 6970c4bc8cc34be7d6c88739a63c916aa3d89a2d..c6a0d6b751eac7fee2a5822d0ec3622c8c9ff079 100644
--- a/common/threading/Semaphores.hpp
+++ b/common/threading/Semaphores.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/SocketPair.cpp b/common/threading/SocketPair.cpp
index f36b10ab021eac11a0c2d249591f1020b2c0f685..5e14d67140371f07bab50186c94b6c8d2eb56337 100644
--- a/common/threading/SocketPair.cpp
+++ b/common/threading/SocketPair.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/SocketPair.hpp b/common/threading/SocketPair.hpp
index 57e0d411959f55ba7b9ec03243e5ba29a4c57332..170691787dcde61b0c22f76937f7b5a2783fef3b 100644
--- a/common/threading/SocketPair.hpp
+++ b/common/threading/SocketPair.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/SocketPairTest.cpp b/common/threading/SocketPairTest.cpp
index 01aa8aaf7ba69ab8dac6bebdde6ea06d677550a0..a0429ff0b7bf8ae0cbb670e9ef04e1559f0970e7 100644
--- a/common/threading/SocketPairTest.cpp
+++ b/common/threading/SocketPairTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/SubProcess.cpp b/common/threading/SubProcess.cpp
index e88f56d139766fb165a1b235be8d27f151e7cf55..7c232b23fe4b903d8977a6c51ca18c0e6642cc1a 100644
--- a/common/threading/SubProcess.cpp
+++ b/common/threading/SubProcess.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/SubProcess.hpp b/common/threading/SubProcess.hpp
index 75dca5e8ec5786a24f9672c657dae59347dbb510..3467cb027941597a8066bbdcd4a188d911a94129 100644
--- a/common/threading/SubProcess.hpp
+++ b/common/threading/SubProcess.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/System.cpp b/common/threading/System.cpp
index 248e6a056951c6f905d6ad1e8c6ba6cb61411452..2fd25e167fcc03c737460e9509ddcd35b5b75864 100644
--- a/common/threading/System.cpp
+++ b/common/threading/System.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/System.hpp b/common/threading/System.hpp
index af7b4e30658fdc307d0d3fa48196aed306f3e565..583b33aa8de5b6b3ef1196b0140e1a5fff3cae53 100644
--- a/common/threading/System.hpp
+++ b/common/threading/System.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/Thread.cpp b/common/threading/Thread.cpp
index 893ce1c970a7820a9ab3949d98447cd403cda25a..235873b3d364a437fd0720b465ff4e45c9df13f0 100644
--- a/common/threading/Thread.cpp
+++ b/common/threading/Thread.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/Thread.hpp b/common/threading/Thread.hpp
index dbb0c26a36f153ac1fbb062882457ee46ab83a10..ab99aa2ad6a3ee062398716151f42580e5025890 100644
--- a/common/threading/Thread.hpp
+++ b/common/threading/Thread.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/ThreadingBlockingQTests.cpp b/common/threading/ThreadingBlockingQTests.cpp
index 4522b51337e934c58e46a1133978d5e52c860602..15573b080011177892b0324840da141b8e2bab76 100644
--- a/common/threading/ThreadingBlockingQTests.cpp
+++ b/common/threading/ThreadingBlockingQTests.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/ThreadingMPTests.cpp b/common/threading/ThreadingMPTests.cpp
index eb5008e439c4ac6e5ab57da6cde9dba31a9fd3e6..e168d4e4c6749d2373480f6905e6ca7a2fd7da11 100644
--- a/common/threading/ThreadingMPTests.cpp
+++ b/common/threading/ThreadingMPTests.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/ThreadingMTTests.cpp b/common/threading/ThreadingMTTests.cpp
index 2b5b12f9074e07fa4da7988efe9625703958c512..bca23e209b4324acd6f63d7d60e2f588f1a00725 100644
--- a/common/threading/ThreadingMTTests.cpp
+++ b/common/threading/ThreadingMTTests.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/threading/ThreadingTests.cpp b/common/threading/ThreadingTests.cpp
index 7a5f9643b737f8e6043f49987c7cd1645131f054..91e24911c07fc79c09ed3b6df7b2f7995d84a3ec 100644
--- a/common/threading/ThreadingTests.cpp
+++ b/common/threading/ThreadingTests.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/utils/GetOptThreadSafe.cpp b/common/utils/GetOptThreadSafe.cpp
index 6cc91460c6adc4e1da670003891ce6e1e9ef5501..c364063eb6814bb1ce38787f8c59698baf114fc1 100644
--- a/common/utils/GetOptThreadSafe.cpp
+++ b/common/utils/GetOptThreadSafe.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/utils/GetOptThreadSafe.hpp b/common/utils/GetOptThreadSafe.hpp
index 3dcefa4441a4bd9b005516b46eacf7f5a479b8ac..e91c648fff982f46dc352a8b04f7b59768aaeefb 100644
--- a/common/utils/GetOptThreadSafe.hpp
+++ b/common/utils/GetOptThreadSafe.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/utils/GetOptThreadSafeTest.cpp b/common/utils/GetOptThreadSafeTest.cpp
index ce653daff00fceb796fc2df3a33f8f7837209636..02d4b2e10b00bcd4156b04f9b5ca979a779fe987 100644
--- a/common/utils/GetOptThreadSafeTest.cpp
+++ b/common/utils/GetOptThreadSafeTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/utils/Regex.cpp b/common/utils/Regex.cpp
index 6867d481f68fe458edd60e5684af85e6215ed5c8..b26ce951b9c021e123c23032dba4b3aed7681e17 100644
--- a/common/utils/Regex.cpp
+++ b/common/utils/Regex.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/utils/Regex.hpp b/common/utils/Regex.hpp
index b8f0d88cb4d2e48c9c24dfe0084e1a3897b8cb6d..cf58beab0c7a1fa0b9dc134c90536e183be98ab7 100644
--- a/common/utils/Regex.hpp
+++ b/common/utils/Regex.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/utils/RegexTest.cpp b/common/utils/RegexTest.cpp
index 23e122e97460ff2a4a7df90ae076c141fb67abcc..8214c41c784f94d326b9095c351a113cded7aa01 100644
--- a/common/utils/RegexTest.cpp
+++ b/common/utils/RegexTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/utils/UtilsTest.cpp b/common/utils/UtilsTest.cpp
index 68d258af0a0726df2a8b3128641c032bd1b3daba..ba211ec3668c605a426c44434ff1449244a98a9a 100644
--- a/common/utils/UtilsTest.cpp
+++ b/common/utils/UtilsTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/utils/strerror_r_wrapper.cpp b/common/utils/strerror_r_wrapper.cpp
index 9eda158098bed5e0c3243d42b34769d7aa42f771..89ef974b2175d62b009dcbd3065557e132003b9f 100644
--- a/common/utils/strerror_r_wrapper.cpp
+++ b/common/utils/strerror_r_wrapper.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/utils/strerror_r_wrapper.hpp b/common/utils/strerror_r_wrapper.hpp
index e6cfe9fa58dd92d175240e0ccb6d9764234e30c5..3f695515613695ff68932f31dfbf3dcf7c9253a9 100644
--- a/common/utils/strerror_r_wrapper.hpp
+++ b/common/utils/strerror_r_wrapper.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/utils/utils.cpp b/common/utils/utils.cpp
index c01718e6e854dde9e609693746e3b706499fdb81..fb48237ab31ec4098517706de8a6500e2d4a3820 100644
--- a/common/utils/utils.cpp
+++ b/common/utils/utils.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/common/utils/utils.hpp b/common/utils/utils.hpp
index a0c152b68daee3e187197ff5ea7d85304b94c3a0..40645404c0f8e30f4130758c28f4dd28b2a75246 100644
--- a/common/utils/utils.hpp
+++ b/common/utils/utils.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/continuousintegration/buildtree_runner/mhvtl.conf b/continuousintegration/buildtree_runner/mhvtl.conf
index 6e2d982e2c53963f673b0fd20cd66cba0d315389..163068eb0ad7a9d915a116a2e7fc92eb03ace8f1 100644
--- a/continuousintegration/buildtree_runner/mhvtl.conf
+++ b/continuousintegration/buildtree_runner/mhvtl.conf
@@ -1,6 +1,9 @@
 # Home directory for config file(s)
 MHVTL_CONFIG_PATH=/etc/mhvtl
 
+# Home directory for tape emulation files
+MHVTL_HOME_PATH=/opt/mhvtl
+
 # Default media capacity (500 M)
 CAPACITY=1000
 
diff --git a/continuousintegration/buildtree_runner/recreate_buildtree_running_environment.sh b/continuousintegration/buildtree_runner/recreate_buildtree_running_environment.sh
index d2ce55a913e9b6ed49ec7b1333077fd0e734edd4..e9b5a4b277260512bfe43768965209a3c9a90a19 100755
--- a/continuousintegration/buildtree_runner/recreate_buildtree_running_environment.sh
+++ b/continuousintegration/buildtree_runner/recreate_buildtree_running_environment.sh
@@ -63,7 +63,8 @@ ls -lR /opt/mhvtl
 mkdir -p /opt/mhvtl
 sudo groupadd vtl || true
 sudo adduser vtl -g vtl || true
-chown vtl.vtl /opt/mhvtl
+sudo make_vtl_media -C /etc/mhvtl
+chown -R vtl.vtl /opt/mhvtl
 
 ################################################################################
 #### Start mhvtl
diff --git a/continuousintegration/buildtree_runner/vmBootstrap/bootstrapCTA.sh b/continuousintegration/buildtree_runner/vmBootstrap/bootstrapCTA.sh
index 43ca8b7f26b11de589bd56d6c7b6b0cbbbf86410..ee35b5f822f09a203375d634279c6bd5dc9ec106 100755
--- a/continuousintegration/buildtree_runner/vmBootstrap/bootstrapCTA.sh
+++ b/continuousintegration/buildtree_runner/vmBootstrap/bootstrapCTA.sh
@@ -50,8 +50,7 @@ if [[ "$PUBLIC" == false ]] ; then
 else
   sudo wget https://public-yum.oracle.com/RPM-GPG-KEY-oracle-ol7 -O /etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
   sudo wget https://git.ceph.com/release.asc -O /etc/pki/rpm-gpg/RPM-ASC-KEY-ceph
-
-  for i in ~/CTA/continuousintegration/docker/ctafrontend/cc7/etc/yum.repos.d/*.repo; do
+  for i in ~/CTA/continuousintegration/docker/ctafrontend/cc7/etc/yum.repos.d-public/*.repo; do
     sudo yum-config-manager --add-repo=$i
   done
 fi
diff --git a/continuousintegration/buildtree_runner/vmBootstrap/bootstrapSystem.sh b/continuousintegration/buildtree_runner/vmBootstrap/bootstrapSystem.sh
index 29cc9a08418f4943a98de3399bc95eaeaef9f791..ef1c2adda47591b436a173fc114db3e8bbfdaa38 100755
--- a/continuousintegration/buildtree_runner/vmBootstrap/bootstrapSystem.sh
+++ b/continuousintegration/buildtree_runner/vmBootstrap/bootstrapSystem.sh
@@ -15,8 +15,10 @@
 #                 You should have received a copy of the GNU General Public License
 #                 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-echo Initializing krb5.conf...
-sudo cp -fv krb5.conf /etc/krb5.conf
+if [ ! -f /etc/krb5.conf ] || ! (grep default_realm /etc/krb5.conf | grep -qv '^ *#'); then
+  echo Initializing krb5.conf...
+  sudo cp -fv krb5.conf /etc/krb5.conf
+fi
 
 CTAUSER=cta
 if [[ ! -z $1 ]]; then
diff --git a/continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list b/continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list
index 4141c8526b2c254f1956bb7cb5ea74b3984f1e62..e64458c6e4b9fe49f09d967cf37c09ffa3ec8368 100644
--- a/continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list
+++ b/continuousintegration/docker/ctafrontend/cc7/etc/yum/pluginconf.d/versionlock.list
@@ -34,45 +34,45 @@
 1:xrootd-server-devel-4.12.6-1.el7.*
 1:xrootd-server-libs-4.12.6-1.el7.*
 1:xrootd-tests-4.12.6-1.el7.*
-2:ceph-14.2.8-0.el7.x86_64
-2:ceph-base-14.2.8-0.el7.x86_64
-2:ceph-common-14.2.8-0.el7.x86_64
-2:ceph-debuginfo-14.2.8-0.el7.x86_64
-2:cephfs-java-14.2.8-0.el7.x86_64
-2:ceph-fuse-14.2.8-0.el7.x86_64
-2:ceph-mds-14.2.8-0.el7.x86_64
-2:ceph-mgr-14.2.8-0.el7.x86_64
-2:ceph-mon-14.2.8-0.el7.x86_64
-2:ceph-osd-14.2.8-0.el7.x86_64
-2:ceph-radosgw-14.2.8-0.el7.x86_64
-2:ceph-resource-agents-14.2.8-0.el7.x86_64
-2:ceph-selinux-14.2.8-0.el7.x86_64
-2:ceph-test-14.2.8-0.el7.x86_64
-2:libcephfs2-14.2.8-0.el7.x86_64
-2:libcephfs-devel-14.2.8-0.el7.x86_64
-2:libcephfs_jni1-14.2.8-0.el7.x86_64
-2:libcephfs_jni-devel-14.2.8-0.el7.x86_64
-2:librados2-14.2.8-0.el7.x86_64
-2:librados-devel-14.2.8-0.el7.x86_64
-2:libradospp-devel-14.2.8-0.el7.x86_64
-2:libradosstriper1-14.2.8-0.el7.x86_64
-2:libradosstriper-devel-14.2.8-0.el7.x86_64
-2:librbd1-14.2.8-0.el7.x86_64
-2:librbd-devel-14.2.8-0.el7.x86_64
-2:librgw2-14.2.8-0.el7.x86_64
-2:librgw-devel-14.2.8-0.el7.x86_64
-2:python3-ceph-argparse-14.2.8-0.el7.x86_64
-2:python3-cephfs-14.2.8-0.el7.x86_64
-2:python3-rados-14.2.8-0.el7.x86_64
-2:python3-rbd-14.2.8-0.el7.x86_64
-2:python3-rgw-14.2.8-0.el7.x86_64
-2:python-ceph-argparse-14.2.8-0.el7.x86_64
-2:python-ceph-compat-14.2.8-0.el7.x86_64
-2:python-cephfs-14.2.8-0.el7.x86_64
-2:python-rados-14.2.8-0.el7.x86_64
-2:python-rbd-14.2.8-0.el7.x86_64
-2:python-rgw-14.2.8-0.el7.x86_64
-2:rados-objclass-devel-14.2.8-0.el7.x86_64
-2:rbd-fuse-14.2.8-0.el7.x86_64
-2:rbd-mirror-14.2.8-0.el7.x86_64
-2:rbd-nbd-14.2.8-0.el7.x86_64
+2:ceph-14.2.20-0.el7.x86_64
+2:ceph-base-14.2.20-0.el7.x86_64
+2:ceph-common-14.2.20-0.el7.x86_64
+2:ceph-debuginfo-14.2.20-0.el7.x86_64
+2:cephfs-java-14.2.20-0.el7.x86_64
+2:ceph-fuse-14.2.20-0.el7.x86_64
+2:ceph-mds-14.2.20-0.el7.x86_64
+2:ceph-mgr-14.2.20-0.el7.x86_64
+2:ceph-mon-14.2.20-0.el7.x86_64
+2:ceph-osd-14.2.20-0.el7.x86_64
+2:ceph-radosgw-14.2.20-0.el7.x86_64
+2:ceph-resource-agents-14.2.20-0.el7.x86_64
+2:ceph-selinux-14.2.20-0.el7.x86_64
+2:ceph-test-14.2.20-0.el7.x86_64
+2:libcephfs2-14.2.20-0.el7.x86_64
+2:libcephfs-devel-14.2.20-0.el7.x86_64
+2:libcephfs_jni1-14.2.20-0.el7.x86_64
+2:libcephfs_jni-devel-14.2.20-0.el7.x86_64
+2:librados2-14.2.20-0.el7.x86_64
+2:librados-devel-14.2.20-0.el7.x86_64
+2:libradospp-devel-14.2.20-0.el7.x86_64
+2:libradosstriper1-14.2.20-0.el7.x86_64
+2:libradosstriper-devel-14.2.20-0.el7.x86_64
+2:librbd1-14.2.20-0.el7.x86_64
+2:librbd-devel-14.2.20-0.el7.x86_64
+2:librgw2-14.2.20-0.el7.x86_64
+2:librgw-devel-14.2.20-0.el7.x86_64
+2:python3-ceph-argparse-14.2.20-0.el7.x86_64
+2:python3-cephfs-14.2.20-0.el7.x86_64
+2:python3-rados-14.2.20-0.el7.x86_64
+2:python3-rbd-14.2.20-0.el7.x86_64
+2:python3-rgw-14.2.20-0.el7.x86_64
+2:python-ceph-argparse-14.2.20-0.el7.x86_64
+2:python-ceph-compat-14.2.20-0.el7.x86_64
+2:python-cephfs-14.2.20-0.el7.x86_64
+2:python-rados-14.2.20-0.el7.x86_64
+2:python-rbd-14.2.20-0.el7.x86_64
+2:python-rgw-14.2.20-0.el7.x86_64
+2:rados-objclass-devel-14.2.20-0.el7.x86_64
+2:rbd-fuse-14.2.20-0.el7.x86_64
+2:rbd-mirror-14.2.20-0.el7.x86_64
+2:rbd-nbd-14.2.20-0.el7.x86_64
diff --git a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/init.sh b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/init.sh
index 33a6719f966816353b10b796a1b16fac8c618e5c..2c697ad77a76fe091db7074096efb80d0d5fe7a9 100755
--- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/init.sh
+++ b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/init.sh
@@ -73,7 +73,13 @@ echo ${DATABASEURL} >/etc/cta/cta-catalogue.conf
 if [ "$KEEP_DATABASE" == "0" ]; then
   echo "Wiping database"
   if [ "$DATABASETYPE" != "sqlite" ]; then
-    echo yes | cta-catalogue-schema-drop /etc/cta/cta-catalogue.conf || die "ERROR: Could not wipe database. cta-catalogue-schema-drop /etc/cta/cta-catalogue.conf FAILED"
+    if ! (echo yes | cta-catalogue-schema-drop /etc/cta/cta-catalogue.conf); then
+      # pause to let db come up
+      echo "Database connection failed, pausing before a retry"
+      sleep 5
+      echo yes | cta-catalogue-schema-drop /etc/cta/cta-catalogue.conf || die "ERROR: Could not wipe database. cta-catalogue-schema-drop /etc/cta/cta-catalogue.conf FAILED"
+      echo "Database wiped"
+    fi
   else
     rm -fr $(dirname $(echo ${DATABASEURL} | cut -d: -f2))
   fi
diff --git a/continuousintegration/orchestration/tests/client-ar-abortPrepare.cpp b/continuousintegration/orchestration/tests/client-ar-abortPrepare.cpp
index ddcfee8cdc14798ced85bbb82748997c7f1e2457..10359420e10a810c7e1a07164b9cde2dfcf6063e 100644
--- a/continuousintegration/orchestration/tests/client-ar-abortPrepare.cpp
+++ b/continuousintegration/orchestration/tests/client-ar-abortPrepare.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/cta.spec.in b/cta.spec.in
index 0bdd414696fb20ddc0257ff93e259038c8d8794f..b963bf21f8241d844c4d62dc2118e51b685124f1 100644
--- a/cta.spec.in
+++ b/cta.spec.in
@@ -40,7 +40,7 @@ BuildRequires: cmake >= 2.6 redhat-rpm-config
 
 # The CTA client is the only component of CTA that can be compiled on both SLC6
 # and C77, therefore only the packages it depends on are required for SLC6
-%define radosVersion 2:14.2.8
+%define radosVersion 2:14.2.20
 %define xrootdVersion 1:4.12.4-1
 BuildRequires: xrootd-client-devel  >= %{xrootdVersion}
 BuildRequires: xrootd-devel         >= %{xrootdVersion}
@@ -191,6 +191,7 @@ The command line utilities
 %attr(0644,root,root) %doc /usr/share/man/man1/cta-admin.1cta.gz
 %attr(0755,root,root) %{_bindir}/cta-send-event
 %attr(0755,root,root) %{_bindir}/cta-send-closew.sh
+%attr(0755,root,root) %{_bindir}/cta-verify-file
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta/cta-cli.conf
 
 %package -n cta-lib-common
@@ -491,6 +492,19 @@ Currently contains a helper for the client-ar script, which should be installed
 %attr(0755,root,root) /usr/bin/cta-client-ar-abortPrepare
 
 %changelog
+* Tue Jul 27 2021 julien.leduc (at) cern.ch - 4.0-5
+- [frontend] Add options to "tapepool ls" to filter tapepools on their name, vo and encryption
+- cta/CTA#898 cta-send-event now gets the requester id and eos instance as command line arguments
+- cta/CTA#1005 "tape ls" now can filter tapes on wether they were imported from CASTOR
+- cta/CTA#1006 "repack ls" now shows the tapepool of the tape being repacked
+- [frontend] Adds missing break after "schedulinginfo ls" command
+- cta/CTA#999 Adds a default mount rule
+- cta/CTA#1003 The expansion of a repack request now fails if the archive route for archiving the repacked files is missing
+* Fri Jul 09 2021 julien.leduc (at) cern.ch - 4.0-4
+- cta/CTA#1002 Do not requeue report jobs when reportType is NoReportRequired
+* Mon Jul 05 2021 julien.leduc (at) cern.ch - 4.0-3
+- Upgraded ceph to version 14.2.20
+- Adds cta-verify-file to cta-cli RPM
 * Tue Jun 01 2021 julien.leduc (at) cern.ch - 4.0-2
 - Upgraded EOS to 4.8.45
 - Upgraded eos-xrootd to 4.12.8
diff --git a/disk/CryptoPPTest.cpp b/disk/CryptoPPTest.cpp
index 14941ef254d539d101858de947e1731af618719f..567debfb47609e160865e8888934933010d986d0 100644
--- a/disk/CryptoPPTest.cpp
+++ b/disk/CryptoPPTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/disk/DiskFile.cpp b/disk/DiskFile.cpp
index 9fe1161122836c6fc99601b3be60982c8042473a..75ca37c4e79bad5270e892fa8b741ea861443130 100644
--- a/disk/DiskFile.cpp
+++ b/disk/DiskFile.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/disk/DiskFile.hpp b/disk/DiskFile.hpp
index 8d07f80a1d0f00c3b52e7771572fcc5f59794443..5a0bab508c7f3ff3a64d001d77feee00abd6cc4b 100644
--- a/disk/DiskFile.hpp
+++ b/disk/DiskFile.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/disk/DiskFileImplementations.hpp b/disk/DiskFileImplementations.hpp
index 3b8a56050315991e72357b199db82de90db67f7f..c447610e471526762dc784c5c3795d882b62bf0a 100644
--- a/disk/DiskFileImplementations.hpp
+++ b/disk/DiskFileImplementations.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/disk/DiskReporter.cpp b/disk/DiskReporter.cpp
index 7d17bcb78cb3bc933fd2da28d3764949c34670ba..92ad306c7ab4609ad6ec65b2a6a507cf908d0904 100644
--- a/disk/DiskReporter.cpp
+++ b/disk/DiskReporter.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/disk/DiskReporter.hpp b/disk/DiskReporter.hpp
index 24629b44bded4f94227cafb2b340675ff34a40b4..b8ee0aebc2b29fa073d5e10f591e76fbe40ffae1 100644
--- a/disk/DiskReporter.hpp
+++ b/disk/DiskReporter.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/disk/DiskReporterFactory.cpp b/disk/DiskReporterFactory.cpp
index 9da29a2e749a150f4e5bf69f840ef15ad8cef928..54037f5e673eeec90dffef2541204681540fc13e 100644
--- a/disk/DiskReporterFactory.cpp
+++ b/disk/DiskReporterFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/disk/DiskReporterFactory.hpp b/disk/DiskReporterFactory.hpp
index 5fcf959d57f219f8ef889ee8825fa03c6c31777a..ca265cc664b163ec574435cf56ca9197577a6a72 100644
--- a/disk/DiskReporterFactory.hpp
+++ b/disk/DiskReporterFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/disk/DiskSystem.cpp b/disk/DiskSystem.cpp
index a908937e8f6d0e30c123e19d11ded068f97ccc10..48b75b03597297818c7ebaa169d95c4728caa865 100644
--- a/disk/DiskSystem.cpp
+++ b/disk/DiskSystem.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/disk/DiskSystem.hpp b/disk/DiskSystem.hpp
index a7ff0e3373be41673b0a07d44cf25c1aae64f762..f78d9261c0a9fcbfe5ec666b7966167bfa090eb4 100644
--- a/disk/DiskSystem.hpp
+++ b/disk/DiskSystem.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/disk/DiskSystemTest.cpp b/disk/DiskSystemTest.cpp
index 3b74963c16ad1472e92195295e351ff8bdd92fc7..c0a4781f40aa56bb0bb69697adea8dd3e0115666 100644
--- a/disk/DiskSystemTest.cpp
+++ b/disk/DiskSystemTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/disk/EOSReporter.cpp b/disk/EOSReporter.cpp
index 333fd633f64cf287135d6977126c23c86597d689..56038e31700a63c73fdbb8c1f3ad34dc032d1680 100644
--- a/disk/EOSReporter.cpp
+++ b/disk/EOSReporter.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/disk/EOSReporter.hpp b/disk/EOSReporter.hpp
index 501cf351023c0005ecb011d3c2ccd64a26f38d4c..74499a9a8a31669b1a315f8a959218c73e39b8b6 100644
--- a/disk/EOSReporter.hpp
+++ b/disk/EOSReporter.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/disk/JSONDiskSystem.cpp b/disk/JSONDiskSystem.cpp
index 25a841736dad664fc357e0edf3c2d3dcfbd5a3ac..2fdf60e53b06b664fda7837f688ca531e3aa76e6 100644
--- a/disk/JSONDiskSystem.cpp
+++ b/disk/JSONDiskSystem.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/disk/JSONDiskSystem.hpp b/disk/JSONDiskSystem.hpp
index dec93bd650185d22ea25805d4fa7d6148e299cb9..0cbdb1c28d29c69663c6b749a3f9afe21c2118ea 100644
--- a/disk/JSONDiskSystem.hpp
+++ b/disk/JSONDiskSystem.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/disk/JSONFreeSpace.cpp b/disk/JSONFreeSpace.cpp
index 888de5081909b8e18d14f7a0fdc762c1a622161a..f2a047cd7c9762a8169735c8f1a286b48c16e282 100644
--- a/disk/JSONFreeSpace.cpp
+++ b/disk/JSONFreeSpace.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/disk/JSONFreeSpace.hpp b/disk/JSONFreeSpace.hpp
index a2198bec4aac6ea3948f06be9a8331861898c3a4..ea34714626f4ee07b5cf15b99040c02feaaa1904 100644
--- a/disk/JSONFreeSpace.hpp
+++ b/disk/JSONFreeSpace.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/disk/NullReporter.hpp b/disk/NullReporter.hpp
index 817c72658332fc87af345b4a3cb485edc1f291a0..5335062ded75fa3196434a72b6b0d8cb263db1bd 100644
--- a/disk/NullReporter.hpp
+++ b/disk/NullReporter.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/disk/RadosStriperPool.cpp b/disk/RadosStriperPool.cpp
index ef60025d8366abcf2ad9a98e0bb4856894868232..6cbfcd10f73f741b23f889235c83ef32f1d813f6 100644
--- a/disk/RadosStriperPool.cpp
+++ b/disk/RadosStriperPool.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/disk/RadosStriperPool.hpp b/disk/RadosStriperPool.hpp
index d4b2e3cc67a84a30332d31facce93c8034aeffb1..c50d1b6a18c06380fd358661a07f632afc4a4821 100644
--- a/disk/RadosStriperPool.hpp
+++ b/disk/RadosStriperPool.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/CmdLine.cpp b/mediachanger/CmdLine.cpp
index a6a0407e18fce231deb07f9bc8add7ecbaea5257..6cad1384b8843514766a796ba29fe88696cf13a8 100644
--- a/mediachanger/CmdLine.cpp
+++ b/mediachanger/CmdLine.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/CmdLine.hpp b/mediachanger/CmdLine.hpp
index a3ec4990c926ad6d6a8b27e290d107ec2157646b..437fd04ee0c5ba2ec5c919e82ed344676003118a 100644
--- a/mediachanger/CmdLine.hpp
+++ b/mediachanger/CmdLine.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/CmdLineTool.cpp b/mediachanger/CmdLineTool.cpp
index 10abbf951a3ba197eb8bbbe96cb093fddf67a37f..f87cd409011f46e50cc182f6a765bbdda38bf96c 100644
--- a/mediachanger/CmdLineTool.cpp
+++ b/mediachanger/CmdLineTool.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/CmdLineTool.hpp b/mediachanger/CmdLineTool.hpp
index 27e9adc54b4876bd1eaa38820a42bb540b64421a..51b560ab32dc1b23a7e656e0a5e2cad3f9d483b7 100644
--- a/mediachanger/CmdLineTool.hpp
+++ b/mediachanger/CmdLineTool.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/CommonMarshal.cpp b/mediachanger/CommonMarshal.cpp
index 8c76d0fb347d9da41ef04fca9db8dbaeb3614031..e5b3e0de20652e595d520b15a9414bd7b246a366 100644
--- a/mediachanger/CommonMarshal.cpp
+++ b/mediachanger/CommonMarshal.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/CommonMarshal.hpp b/mediachanger/CommonMarshal.hpp
index b774392bcf521e3f9dd49dbb8e6fdc5c0e0b6bcc..56b9af63d2d5c39b48aa87dd6b60992e0e7d94d3 100644
--- a/mediachanger/CommonMarshal.hpp
+++ b/mediachanger/CommonMarshal.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/Constants.hpp b/mediachanger/Constants.hpp
index 532cabb851e2fd33cb6e1d959b5b5a5d1cf9bd0b..16db59e2c974576885b7a0d21120f95c3128905a 100644
--- a/mediachanger/Constants.hpp
+++ b/mediachanger/Constants.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/DebugBuf.cpp b/mediachanger/DebugBuf.cpp
index ec2eec07336874adf459931be9af503bc52070bc..8ddb8141e59c82abc8033b6ee1f592f5646c03c8 100644
--- a/mediachanger/DebugBuf.cpp
+++ b/mediachanger/DebugBuf.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/DebugBuf.hpp b/mediachanger/DebugBuf.hpp
index 5e48107d6b1fb5e86ea9e27188a8d626b1c4ad0b..35d61a01eee5415c11507f4753d474a5484a6717 100644
--- a/mediachanger/DebugBuf.hpp
+++ b/mediachanger/DebugBuf.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/DismountCmd.cpp b/mediachanger/DismountCmd.cpp
index a76ff4bc566d0d0d1816920aee7b935d967ec55a..852ce91ec02af302997eace0bd6f333ed6e31f1c 100644
--- a/mediachanger/DismountCmd.cpp
+++ b/mediachanger/DismountCmd.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/DismountCmd.hpp b/mediachanger/DismountCmd.hpp
index a38ef82e6f05efaa86b9264977503e0c40809880..40d8934330ad3a9e996055a3a71c5c12a618b924 100644
--- a/mediachanger/DismountCmd.hpp
+++ b/mediachanger/DismountCmd.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/DismountCmdLine.cpp b/mediachanger/DismountCmdLine.cpp
index 665c961ca02ddce757945bce2ca2951619aec276..22c166f478fae345eea0c07856ca390b70ad111d 100644
--- a/mediachanger/DismountCmdLine.cpp
+++ b/mediachanger/DismountCmdLine.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/DismountCmdLine.hpp b/mediachanger/DismountCmdLine.hpp
index 79a074281b1b5876bab299cf1aca00ba7ff7204b..1169676084281321a42e10dcb9586ee9a9db5a28 100644
--- a/mediachanger/DismountCmdLine.hpp
+++ b/mediachanger/DismountCmdLine.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/DismountCmdLineTest.cpp b/mediachanger/DismountCmdLineTest.cpp
index 16fe9a370749949f57f65839d9e506a43d4a1544..d7fc4131ddac7cdfb2222ce94b37ad5420f1662a 100644
--- a/mediachanger/DismountCmdLineTest.cpp
+++ b/mediachanger/DismountCmdLineTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/DismountCmdMain.cpp b/mediachanger/DismountCmdMain.cpp
index fb0c089d98d667e50a072fae8da6c7f1db2827c4..06cda4e1d13470867a628f2f8b3d082bde19934d 100644
--- a/mediachanger/DismountCmdMain.cpp
+++ b/mediachanger/DismountCmdMain.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/IoTest.cpp b/mediachanger/IoTest.cpp
index d0e622d83f36ce58676a635638d7f0bd538f2a03..f80ada9c3806907377ff64d07250bb297cb7364b 100644
--- a/mediachanger/IoTest.cpp
+++ b/mediachanger/IoTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/IpAndPort.cpp b/mediachanger/IpAndPort.cpp
index 553ceb2340fda19978f32f9e5247483b66bc55e8..d8ba5e26b9510e232d831ae8c1e490381ff98af2 100644
--- a/mediachanger/IpAndPort.cpp
+++ b/mediachanger/IpAndPort.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/IpAndPort.hpp b/mediachanger/IpAndPort.hpp
index 2cd395fae3537a4eb8adc38a54aa4879d358c3fd..4c41438999b625b9539cbb7da40283732ac051ef 100644
--- a/mediachanger/IpAndPort.hpp
+++ b/mediachanger/IpAndPort.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/LibrarySlot.cpp b/mediachanger/LibrarySlot.cpp
index 9002caca3a33c8d2078769370d134005b29ba8c6..a756a6ed5358a90c4834f133711fa5ca297257e0 100644
--- a/mediachanger/LibrarySlot.cpp
+++ b/mediachanger/LibrarySlot.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/LibrarySlot.hpp b/mediachanger/LibrarySlot.hpp
index 964d2aacf9cc7ac3e3e574e55e58895f8efa12d0..394325014865a23cfa86f9b6f05409389cc43216 100644
--- a/mediachanger/LibrarySlot.hpp
+++ b/mediachanger/LibrarySlot.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/LibrarySlotParser.cpp b/mediachanger/LibrarySlotParser.cpp
index f0999cca3cdc0fac9076b9427764ecc055813509..f6cbbcad84d72bbd880dcbbdbdd337d000324c82 100644
--- a/mediachanger/LibrarySlotParser.cpp
+++ b/mediachanger/LibrarySlotParser.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/LibrarySlotParser.hpp b/mediachanger/LibrarySlotParser.hpp
index 0ff865e9df95ef7177425d072126db4879016e28..e7013af67164b110a5e13f955b08c723643224c5 100644
--- a/mediachanger/LibrarySlotParser.hpp
+++ b/mediachanger/LibrarySlotParser.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/LibrarySlotParserTest.cpp b/mediachanger/LibrarySlotParserTest.cpp
index b4a3ac48a11acd2dd36144e30d6a13deddd500aa..b06b0bebdc8f10c6744bbc84e38d4c1ad77cfa0b 100644
--- a/mediachanger/LibrarySlotParserTest.cpp
+++ b/mediachanger/LibrarySlotParserTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/ManualLibrarySlot.cpp b/mediachanger/ManualLibrarySlot.cpp
index 38dd53595407e2ae623fb671362384222fbd9e00..5221f9c3b1f4ba615a9ebd7845de867bd2c9941d 100644
--- a/mediachanger/ManualLibrarySlot.cpp
+++ b/mediachanger/ManualLibrarySlot.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/ManualLibrarySlot.hpp b/mediachanger/ManualLibrarySlot.hpp
index 895eabe09142e32047b3f65e8c9acd82af0d3cc1..f1c4444c24c72705ad9c178df224847e0a8ce372 100644
--- a/mediachanger/ManualLibrarySlot.hpp
+++ b/mediachanger/ManualLibrarySlot.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/ManualLibrarySlotTest.cpp b/mediachanger/ManualLibrarySlotTest.cpp
index bcce6f30168bddff90cb660c299b504b2fd5226a..e0be806000752a98af5cd7fad0b659c7fa4ce619 100644
--- a/mediachanger/ManualLibrarySlotTest.cpp
+++ b/mediachanger/ManualLibrarySlotTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/MediaChangerFacade.cpp b/mediachanger/MediaChangerFacade.cpp
index 31f05049bf6ddebe8e4b5e63888013c2b9bbcbb9..979beb9691b0f814607c43e12de32fa696116b03 100644
--- a/mediachanger/MediaChangerFacade.cpp
+++ b/mediachanger/MediaChangerFacade.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/MediaChangerFacade.hpp b/mediachanger/MediaChangerFacade.hpp
index 26a665e6a9b47395be46a2bee9e503190f076599..5f5c747cf996f98b131bdc13934155ae97dc5623 100644
--- a/mediachanger/MediaChangerFacade.hpp
+++ b/mediachanger/MediaChangerFacade.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/MediaChangerProxy.cpp b/mediachanger/MediaChangerProxy.cpp
index 2faf2adb45ccbf0adf64fc4e3760748b909e685a..a9e92629ada67d7b0de398f6e38de9a4b904262c 100644
--- a/mediachanger/MediaChangerProxy.cpp
+++ b/mediachanger/MediaChangerProxy.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/MediaChangerProxy.hpp b/mediachanger/MediaChangerProxy.hpp
index 4c5722b83840677970dc2c253d72cccc173bbae9..031b952f83b0fcc635704a99fdb69332c4ef2ed4 100644
--- a/mediachanger/MediaChangerProxy.hpp
+++ b/mediachanger/MediaChangerProxy.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/MessageHeader.cpp b/mediachanger/MessageHeader.cpp
index fc6f4ca48f4c05052b0735d0415ee93b1e36d5e3..9104f8f0e1519c91b91793b42b268a0d898529e5 100644
--- a/mediachanger/MessageHeader.cpp
+++ b/mediachanger/MessageHeader.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/MessageHeader.hpp b/mediachanger/MessageHeader.hpp
index a0b60e9857bdbfd9e100427b31f3202ae5c92781..6ba2f9d178749165d337acc94920d0ee88bfd55f 100644
--- a/mediachanger/MessageHeader.hpp
+++ b/mediachanger/MessageHeader.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/MmcProxy.cpp b/mediachanger/MmcProxy.cpp
index 47b269cd1f749320151d343dcc0384e9ef416d6c..34420e613a54bc5e2062da90d74f47921e37c9ba 100644
--- a/mediachanger/MmcProxy.cpp
+++ b/mediachanger/MmcProxy.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/MmcProxy.hpp b/mediachanger/MmcProxy.hpp
index 0d3819e1065a28046bfdc7a830f05fa05db1315c..0fbfe305a7a585afed679515d3190ab62377bd21 100644
--- a/mediachanger/MmcProxy.hpp
+++ b/mediachanger/MmcProxy.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/MountCmd.cpp b/mediachanger/MountCmd.cpp
index 589f82272842ab51e7a4de1c1ed8ea5e11d5b1c4..4d86aaacd5081a32f35cab641151da4bceabfc8b 100644
--- a/mediachanger/MountCmd.cpp
+++ b/mediachanger/MountCmd.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/MountCmd.hpp b/mediachanger/MountCmd.hpp
index 0d84008631605bf46e0bda559da051c06d43ec59..508986c2e748297592808c2a2e3486180167cd33 100644
--- a/mediachanger/MountCmd.hpp
+++ b/mediachanger/MountCmd.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/MountCmdLine.cpp b/mediachanger/MountCmdLine.cpp
index 7efbaf4dd0292e0fca0878f002aa94c1a86c1985..19273782ffb4e230e0970bb4cdfcc1d7303d8c23 100644
--- a/mediachanger/MountCmdLine.cpp
+++ b/mediachanger/MountCmdLine.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/MountCmdLine.hpp b/mediachanger/MountCmdLine.hpp
index 536117397b2e1e49cf4807bf056d637d06e4f77f..0c3ac7278c39957a835fc38249de01a7258a61ba 100644
--- a/mediachanger/MountCmdLine.hpp
+++ b/mediachanger/MountCmdLine.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/MountCmdLineTest.cpp b/mediachanger/MountCmdLineTest.cpp
index c91264d2dd774eebd1ded85266a7b97f7c1b7c90..0d1bf4d76459848e9eede7bf1f560a2b311bdb25 100644
--- a/mediachanger/MountCmdLineTest.cpp
+++ b/mediachanger/MountCmdLineTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/MountCmdMain.cpp b/mediachanger/MountCmdMain.cpp
index 5ca7334dcbf352f1f1795c56f2120cf4a14b261f..bee51e1eb20c30a464e1f65fdbc1e9833eab02af 100644
--- a/mediachanger/MountCmdMain.cpp
+++ b/mediachanger/MountCmdMain.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/RmcMarshal.cpp b/mediachanger/RmcMarshal.cpp
index 84f06d80e95bc49a93684e653a22c8fa250ed337..9e17c54144114c847d1e63aa04f5e8d766a0fee8 100644
--- a/mediachanger/RmcMarshal.cpp
+++ b/mediachanger/RmcMarshal.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/RmcMarshal.hpp b/mediachanger/RmcMarshal.hpp
index ab341ea1d009deff6f5040e929b74731de5f2574..567c354414ad06d49c6a764d3c409184914a1c9c 100644
--- a/mediachanger/RmcMarshal.hpp
+++ b/mediachanger/RmcMarshal.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/RmcMountMsgBody.cpp b/mediachanger/RmcMountMsgBody.cpp
index 8f54841c770f714b94c905a790192ec63d329316..5fabdfc4c8e14eaedbf16bb3e2e5ba8125859d98 100644
--- a/mediachanger/RmcMountMsgBody.cpp
+++ b/mediachanger/RmcMountMsgBody.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/RmcMountMsgBody.hpp b/mediachanger/RmcMountMsgBody.hpp
index 4bae22c5c7bf24801eefc9d1838fda0505c78e13..cc7cdfac0e54ca112f060e360cc2ecd08191ce15 100644
--- a/mediachanger/RmcMountMsgBody.hpp
+++ b/mediachanger/RmcMountMsgBody.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/RmcProxy.cpp b/mediachanger/RmcProxy.cpp
index 0a9f4a9d39873f4a243ca7a2f574794225373819..decdfd51036b15ed9ee5ebca80ee36def2ab566b 100644
--- a/mediachanger/RmcProxy.cpp
+++ b/mediachanger/RmcProxy.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/RmcProxy.hpp b/mediachanger/RmcProxy.hpp
index 6f306fccde1e05f0bef029401350fe72ba7bf1c7..04658d8cc2746d4913f06a0ff201d698cb8f9c54 100644
--- a/mediachanger/RmcProxy.hpp
+++ b/mediachanger/RmcProxy.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/RmcUnmountMsgBody.cpp b/mediachanger/RmcUnmountMsgBody.cpp
index 505a67d8f51e3254971547fd167ea6c25eda92b5..d0ed8eef88b30b7648d5c92e8836a4b6b5c0a89c 100644
--- a/mediachanger/RmcUnmountMsgBody.cpp
+++ b/mediachanger/RmcUnmountMsgBody.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/RmcUnmountMsgBody.hpp b/mediachanger/RmcUnmountMsgBody.hpp
index 25eb40b18283627c5eaf4a2e5dd7cb0fefbb01f6..282deebb77252d51ab515044e4a5642ffdb7fcc7 100644
--- a/mediachanger/RmcUnmountMsgBody.hpp
+++ b/mediachanger/RmcUnmountMsgBody.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/ScsiLibrarySlot.cpp b/mediachanger/ScsiLibrarySlot.cpp
index 1ad49a025e79b53bfad8732b1014938cc5e718ac..4e4ca731160d056549d95e700303b0cd0402a920 100644
--- a/mediachanger/ScsiLibrarySlot.cpp
+++ b/mediachanger/ScsiLibrarySlot.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/ScsiLibrarySlot.hpp b/mediachanger/ScsiLibrarySlot.hpp
index 3eab981f7c47092555d0ac7f75c54e1d3d2aacdc..95a1ae6cbff4a1cb72b1bc04c6eaac3982d54460 100644
--- a/mediachanger/ScsiLibrarySlot.hpp
+++ b/mediachanger/ScsiLibrarySlot.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/ScsiLibrarySlotTest.cpp b/mediachanger/ScsiLibrarySlotTest.cpp
index e443558b3fefe4e83cace134d10a5c03d7d607da..db9b41545e3584f9d1a6988cdbf8193f93167360 100644
--- a/mediachanger/ScsiLibrarySlotTest.cpp
+++ b/mediachanger/ScsiLibrarySlotTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/TapeLibraryType.cpp b/mediachanger/TapeLibraryType.cpp
index 66466fc58e9ff09102045254bd3a6655b1ae6888..42e1a34c42e880a906724f500b7ef828db3cb00a 100644
--- a/mediachanger/TapeLibraryType.cpp
+++ b/mediachanger/TapeLibraryType.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/TapeLibraryType.hpp b/mediachanger/TapeLibraryType.hpp
index 8ae05b5d31f34d095a376d71a5db93038374157b..37ed4d46b311a10dc16a1810367adeee36b42a71 100644
--- a/mediachanger/TapeLibraryType.hpp
+++ b/mediachanger/TapeLibraryType.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/castorrmc/common/strerror_r_wrapper.cpp b/mediachanger/castorrmc/common/strerror_r_wrapper.cpp
index 4f21e14e556cf154ab6fb35ddef7515cb9424c35..6dcd563fd052f15826a0b12c234a81ae14422735 100644
--- a/mediachanger/castorrmc/common/strerror_r_wrapper.cpp
+++ b/mediachanger/castorrmc/common/strerror_r_wrapper.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/io.cpp b/mediachanger/io.cpp
index 9258591dc25494a0b613bec0336c6c8113ef5365..9f01996929d0083d8da72a5b90fab256c90b65a5 100644
--- a/mediachanger/io.cpp
+++ b/mediachanger/io.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/mediachanger/io.hpp b/mediachanger/io.hpp
index 21685b83e0c8b88f8ef0a7766487cf7763fd68b0..abc8aa683d88e32884bf2a520d3d3f1b66850e16 100644
--- a/mediachanger/io.hpp
+++ b/mediachanger/io.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/Agent.cpp b/objectstore/Agent.cpp
index e7fe95439ba660d27e520e739550392d1e024ee5..d19e309cc1e436d19bbc19738684a8b0a48c42d5 100644
--- a/objectstore/Agent.cpp
+++ b/objectstore/Agent.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/Agent.hpp b/objectstore/Agent.hpp
index 08a197ae2e86a5864bfbff12a6b07528f1091eb3..502d754e8c526d412df43b0a48cd1f82b2d37e00 100644
--- a/objectstore/Agent.hpp
+++ b/objectstore/Agent.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/AgentHeartbeatThread.cpp b/objectstore/AgentHeartbeatThread.cpp
index ba0f2562d3f6db42f31f54692102d4497c136487..01b4a37bd1bdae328a199cb7959fce45e75b8ef9 100644
--- a/objectstore/AgentHeartbeatThread.cpp
+++ b/objectstore/AgentHeartbeatThread.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/AgentHeartbeatThread.hpp b/objectstore/AgentHeartbeatThread.hpp
index e15bff3bc18f25b5dbd3af348e34082338749f01..6c15c65933fc408a279d9004c304f393379e2608 100644
--- a/objectstore/AgentHeartbeatThread.hpp
+++ b/objectstore/AgentHeartbeatThread.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/AgentReference.cpp b/objectstore/AgentReference.cpp
index 163917e8b043973db4bf093469227b1767024ab9..2a76721edd22dbf720c81d1e7789a2c3485a6e08 100644
--- a/objectstore/AgentReference.cpp
+++ b/objectstore/AgentReference.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/AgentReference.hpp b/objectstore/AgentReference.hpp
index 7006679ae594ff6faa7d15a987620b581071ebef..0a8115a63c5024fb1ff0721d41b8bba3403b3e6a 100644
--- a/objectstore/AgentReference.hpp
+++ b/objectstore/AgentReference.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/AgentReferenceInterface.cpp b/objectstore/AgentReferenceInterface.cpp
index 0fafdd8e2494945acdcab071cbf21dba3862e8db..8b20b4b0069b026b273d43208e0bbf5cc6acf993 100644
--- a/objectstore/AgentReferenceInterface.cpp
+++ b/objectstore/AgentReferenceInterface.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/AgentReferenceInterface.hpp b/objectstore/AgentReferenceInterface.hpp
index 0387e7be9d92e541b0d9153a8ca6dd9c94ebda1a..74a296afba148c61255c9ac5fb20265e5435185c 100644
--- a/objectstore/AgentReferenceInterface.hpp
+++ b/objectstore/AgentReferenceInterface.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/AgentRegister.cpp b/objectstore/AgentRegister.cpp
index 642a2388370eb3a039581125dd698c96c77c91f5..4b41f04b6ce208755ff9e0701d167e9c5eb8d3e3 100644
--- a/objectstore/AgentRegister.cpp
+++ b/objectstore/AgentRegister.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/AgentRegister.hpp b/objectstore/AgentRegister.hpp
index bf8f1db1353572faf81fc1fdaa6f06b7e165d7c9..310ae9904d7d74ab305dea9610c193b184818278 100644
--- a/objectstore/AgentRegister.hpp
+++ b/objectstore/AgentRegister.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/AgentWatchdog.cpp b/objectstore/AgentWatchdog.cpp
index a9def5881156e4264eb215f3206d70274f3ce340..4024f759a371f5a92c3eb5147597e5e4a444ede4 100644
--- a/objectstore/AgentWatchdog.cpp
+++ b/objectstore/AgentWatchdog.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/AgentWatchdog.hpp b/objectstore/AgentWatchdog.hpp
index 31888666d010de1345da7529fdfa26ac77892b38..e3022b033e1ba55ea0cc95f9a9507ec133b9a2f7 100644
--- a/objectstore/AgentWatchdog.hpp
+++ b/objectstore/AgentWatchdog.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/AgentWrapper.cpp b/objectstore/AgentWrapper.cpp
index 7ca6cf72149e37d417f5833f38421636031d391e..1ac42c9671e8d7fbc56a952af5217415b4561eb8 100644
--- a/objectstore/AgentWrapper.cpp
+++ b/objectstore/AgentWrapper.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/AgentWrapper.hpp b/objectstore/AgentWrapper.hpp
index e8d053db87e7fdd871c8903bbf59c0f4c048cb6f..6695a33294a67598b1317dcc4f08231709e622da 100644
--- a/objectstore/AgentWrapper.hpp
+++ b/objectstore/AgentWrapper.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/Algorithms.hpp b/objectstore/Algorithms.hpp
index a1860b6c9f511e1f9f90ea2ba9a4b1bee1de7ae4..c61755b57b6c411e089ca95dfa80e7c4d48caac7 100644
--- a/objectstore/Algorithms.hpp
+++ b/objectstore/Algorithms.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/AlgorithmsTest.cpp b/objectstore/AlgorithmsTest.cpp
index 9a05b679e141be5abf5337c12fdb895e3875ab48..0a83c019502587aa6b29ab52a56b0526c42129c9 100644
--- a/objectstore/AlgorithmsTest.cpp
+++ b/objectstore/AlgorithmsTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/ArchiveFileSerDeser.hpp b/objectstore/ArchiveFileSerDeser.hpp
index 13ee4c2765c69097ba5ec878f75a71caea932233..cb1abab3e36524ba39c72b389548ddb55ee5fc7b 100644
--- a/objectstore/ArchiveFileSerDeser.hpp
+++ b/objectstore/ArchiveFileSerDeser.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/ArchiveQueue.cpp b/objectstore/ArchiveQueue.cpp
index 9888c2112152f540fdc51aec4dd2c23f7fc59af0..9fa15b48b13e824e6cc1274a8864e76516720044 100644
--- a/objectstore/ArchiveQueue.cpp
+++ b/objectstore/ArchiveQueue.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/ArchiveQueue.hpp b/objectstore/ArchiveQueue.hpp
index d35f13336d2ad88fe15580ec87f691972792f9f8..5b22b9e1e5b60226a885a6bf6f5fde5b369dacf3 100644
--- a/objectstore/ArchiveQueue.hpp
+++ b/objectstore/ArchiveQueue.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/ArchiveQueueAlgorithms.cpp b/objectstore/ArchiveQueueAlgorithms.cpp
index 8091cdaf303f174ab6f1f9a1e41d579dc21095ff..2a94443ea74a9b7f1b613a75288b440c165254c8 100644
--- a/objectstore/ArchiveQueueAlgorithms.cpp
+++ b/objectstore/ArchiveQueueAlgorithms.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/ArchiveQueueAlgorithms.hpp b/objectstore/ArchiveQueueAlgorithms.hpp
index 050e13d882fd75300a1da3de4db86e318da9e17b..43f305b9400279ed491d85a9d9534b55b69fb203 100644
--- a/objectstore/ArchiveQueueAlgorithms.hpp
+++ b/objectstore/ArchiveQueueAlgorithms.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/ArchiveQueueFailedAlgorithms.cpp b/objectstore/ArchiveQueueFailedAlgorithms.cpp
index 6c87cc97f08f41b9b3dd5847b1b2ec14deb80a89..f47515e7b4366409fcb57891f775ebb77f58c2c7 100644
--- a/objectstore/ArchiveQueueFailedAlgorithms.cpp
+++ b/objectstore/ArchiveQueueFailedAlgorithms.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/ArchiveQueueShard.cpp b/objectstore/ArchiveQueueShard.cpp
index ca2fbccc52708bded538603ae001ad6ddb3d767d..27e0c7e5335413e4062dab47448c25d9d6a2d0f1 100644
--- a/objectstore/ArchiveQueueShard.cpp
+++ b/objectstore/ArchiveQueueShard.cpp
@@ -1,7 +1,7 @@
 
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/ArchiveQueueShard.hpp b/objectstore/ArchiveQueueShard.hpp
index 2b248847c5cd95e3fc44b1ba30651eb6001bf6be..12dd6278bd3c4767bc6e259af5546ee6a57d062f 100644
--- a/objectstore/ArchiveQueueShard.hpp
+++ b/objectstore/ArchiveQueueShard.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/ArchiveQueueToReportAlgorithms.cpp b/objectstore/ArchiveQueueToReportAlgorithms.cpp
index 537ad7cc9d23668b49a8e6d52c49747ff8a3001e..8d943783f7f6f40da24d90363c192ffca6b24028 100644
--- a/objectstore/ArchiveQueueToReportAlgorithms.cpp
+++ b/objectstore/ArchiveQueueToReportAlgorithms.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/ArchiveQueueToReportToRepackForFailureAlgorithms.cpp b/objectstore/ArchiveQueueToReportToRepackForFailureAlgorithms.cpp
index 8c68771a3e76182fd9c10c621d40b5c9ff865d9f..f992f6eea09917c0241f303c90775f42cf1d9ed8 100644
--- a/objectstore/ArchiveQueueToReportToRepackForFailureAlgorithms.cpp
+++ b/objectstore/ArchiveQueueToReportToRepackForFailureAlgorithms.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/ArchiveQueueToReportToRepackForSuccessAlgorithms.cpp b/objectstore/ArchiveQueueToReportToRepackForSuccessAlgorithms.cpp
index 2915da732adb6e429ba96284f1d9f58d7c99681e..8520a0e4b5327ea249cdc58b5d2835e283eb2d6d 100644
--- a/objectstore/ArchiveQueueToReportToRepackForSuccessAlgorithms.cpp
+++ b/objectstore/ArchiveQueueToReportToRepackForSuccessAlgorithms.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/ArchiveQueueToTransferAlgorithms.cpp b/objectstore/ArchiveQueueToTransferAlgorithms.cpp
index e124789f0d1a3e28a9938c4c38d325e1f54fd8c3..0b57c8955267568a79801d83b73c02545e2b6894 100644
--- a/objectstore/ArchiveQueueToTransferAlgorithms.cpp
+++ b/objectstore/ArchiveQueueToTransferAlgorithms.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/ArchiveQueueToTransferForRepackAlgorithms.cpp b/objectstore/ArchiveQueueToTransferForRepackAlgorithms.cpp
index 6b75933d1e6132ab83f37ac87744bf1b05d1facd..011035b8239a2d12824a16972eb1d4a3172e6d5f 100644
--- a/objectstore/ArchiveQueueToTransferForRepackAlgorithms.cpp
+++ b/objectstore/ArchiveQueueToTransferForRepackAlgorithms.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/ArchiveRequest.cpp b/objectstore/ArchiveRequest.cpp
index 5211ffc57d7697aa94087a8a77896f7db2bb3b1b..550311331bfc22287f6e0a1bae5190430a1ac0e0 100644
--- a/objectstore/ArchiveRequest.cpp
+++ b/objectstore/ArchiveRequest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/ArchiveRequest.hpp b/objectstore/ArchiveRequest.hpp
index a8185b2ba290b9cacf04a7824b86d83dfd4fe8de..96127c8a5011fe6b50ad85e616cb4ab62d639649 100644
--- a/objectstore/ArchiveRequest.hpp
+++ b/objectstore/ArchiveRequest.hpp
@@ -1,7 +1,7 @@
 
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/Backend.hpp b/objectstore/Backend.hpp
index 35468e48a6646030a1fbebbf5dcc8f070e247c1d..2a3ed01f6ab2870cfc253151515ed95b6632f0e6 100644
--- a/objectstore/Backend.hpp
+++ b/objectstore/Backend.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/BackendFactory.cpp b/objectstore/BackendFactory.cpp
index fdf6e230a389ee975995db63b10b5d4027725eaa..d8c98156bb9b780f96830eaaca6157b6c6f3d820 100644
--- a/objectstore/BackendFactory.cpp
+++ b/objectstore/BackendFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/BackendFactory.hpp b/objectstore/BackendFactory.hpp
index 294f90b3a8f48ba1c8c83eab11a2fcf442b58cd9..40ad25d961c5e7ac7c63ba5db2e1c7fb1695d624 100644
--- a/objectstore/BackendFactory.hpp
+++ b/objectstore/BackendFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/BackendPopulator.cpp b/objectstore/BackendPopulator.cpp
index f3f0dd7e843781bfcff12d52d00e8ecfeffe0256..597565bceba424361bb3e131dff75fa20b3a6893 100644
--- a/objectstore/BackendPopulator.cpp
+++ b/objectstore/BackendPopulator.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/BackendPopulator.hpp b/objectstore/BackendPopulator.hpp
index 1f8c4e35dc34c92b361ab9d348e6888191b746a9..acc604f071a1ae5e3ef8ad3f7af3b57aa0773d9f 100644
--- a/objectstore/BackendPopulator.hpp
+++ b/objectstore/BackendPopulator.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/BackendRados.cpp b/objectstore/BackendRados.cpp
index 0d615b200d3906ebeae01271b72d03b9d0596961..51ce5f363e107b95d91f4cc80c2c1116567049dc 100644
--- a/objectstore/BackendRados.cpp
+++ b/objectstore/BackendRados.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/BackendRados.hpp b/objectstore/BackendRados.hpp
index bc2fc4d368f70cc304a58ce1ef9305f13d6e264c..ca5edd6d257e6fa3b2fac43dd9967017f07ebf65 100644
--- a/objectstore/BackendRados.hpp
+++ b/objectstore/BackendRados.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/BackendRadosTestSwitch.hpp b/objectstore/BackendRadosTestSwitch.hpp
index 717f273ad9649bf691df32e1ae49bba0129555d8..962e2b7052d4765094ee91917f9ab3e734de20d0 100644
--- a/objectstore/BackendRadosTestSwitch.hpp
+++ b/objectstore/BackendRadosTestSwitch.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/BackendTest.cpp b/objectstore/BackendTest.cpp
index 39c77965911822844763ac7e926f11a78fb5515f..fff1e12bc5288186e8abecd8625a6340d14fd631 100644
--- a/objectstore/BackendTest.cpp
+++ b/objectstore/BackendTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/BackendTest.hpp b/objectstore/BackendTest.hpp
index 5498102fd07f751176e379a16f7389b83bac4e3b..93d1c4662fa495f1954164f8cc2c4a17f022aabe 100644
--- a/objectstore/BackendTest.hpp
+++ b/objectstore/BackendTest.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/BackendVFS.cpp b/objectstore/BackendVFS.cpp
index 0285d684d64c04086618e4e429ad754ffe2f4384..c79dab394ac3526f12eb7cbb6710612887f73316 100644
--- a/objectstore/BackendVFS.cpp
+++ b/objectstore/BackendVFS.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/BackendVFS.hpp b/objectstore/BackendVFS.hpp
index d7132d3186e561afa41bcf10817d49caf72f0c59..0011e05623845c64340ed1a3732f5267bc7fb712 100644
--- a/objectstore/BackendVFS.hpp
+++ b/objectstore/BackendVFS.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/DiskFileInfoSerDeser.hpp b/objectstore/DiskFileInfoSerDeser.hpp
index aae159e55335e564017e46f9f52ec81dc22e7a61..5422788c9f8a400bfa3a9763ce41cd81c223e955 100644
--- a/objectstore/DiskFileInfoSerDeser.hpp
+++ b/objectstore/DiskFileInfoSerDeser.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/DriveRegister.cpp b/objectstore/DriveRegister.cpp
index b0bdb7b2a8a293042539967c931ba3dda7e9eab2..0bb0bdc17d83daa97683a9f27fa8b404fffdc83b 100644
--- a/objectstore/DriveRegister.cpp
+++ b/objectstore/DriveRegister.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/DriveRegister.hpp b/objectstore/DriveRegister.hpp
index c0ce77c26a5a79b0b133c17916affd43ea78707f..45fe47d31ef3c1a0e44dc88f0accca6fb5f5ece1 100644
--- a/objectstore/DriveRegister.hpp
+++ b/objectstore/DriveRegister.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/DriveState.cpp b/objectstore/DriveState.cpp
index 2b3a58e443d726ed22e23d6cfc6d987ff4ba75e1..7b318f9e44a612c5d978933a4e21ccb44167bf11 100644
--- a/objectstore/DriveState.cpp
+++ b/objectstore/DriveState.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/DriveState.hpp b/objectstore/DriveState.hpp
index 6b6d341e0797c800f37cc743692fb7387c7f2188..52958408efc0567c12c0a0599c55eac787852c0c 100644
--- a/objectstore/DriveState.hpp
+++ b/objectstore/DriveState.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/EntryLogSerDeser.hpp b/objectstore/EntryLogSerDeser.hpp
index 29a4cd8e35f9671f6e65c44fa05ddd91132cb7c7..28e0c3f53400fd5f7c03774e0ed22e8208c53cbb 100644
--- a/objectstore/EntryLogSerDeser.hpp
+++ b/objectstore/EntryLogSerDeser.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/GarbageCollector.cpp b/objectstore/GarbageCollector.cpp
index 70b052fe15d2b01f65ea0dedc89d59d303d1cc11..db12782fa9e268662ca7ce7f6b7dfc82ff324482 100644
--- a/objectstore/GarbageCollector.cpp
+++ b/objectstore/GarbageCollector.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/GarbageCollector.hpp b/objectstore/GarbageCollector.hpp
index b7d8d5892e21ffbc17f137b636c183e990096f31..b1f1ed03003b25b625989fd9d3c0ec431c2f9ab3 100644
--- a/objectstore/GarbageCollector.hpp
+++ b/objectstore/GarbageCollector.hpp
@@ -1,6 +1,6 @@
   /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/GarbageCollectorTest.cpp b/objectstore/GarbageCollectorTest.cpp
index 42a670c075c2248ae31ddda7211c9e91d424c493..86a4413c0d91f283bff674c518cd15c83d6e98e1 100644
--- a/objectstore/GarbageCollectorTest.cpp
+++ b/objectstore/GarbageCollectorTest.cpp
@@ -1,7 +1,7 @@
 
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/GenericObject.cpp b/objectstore/GenericObject.cpp
index def58032f0a9bcaa3205cc9c921667ac2bda901f..716bfac6dc6b102c2f18d628444a9ea1c3411064 100644
--- a/objectstore/GenericObject.cpp
+++ b/objectstore/GenericObject.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/GenericObject.hpp b/objectstore/GenericObject.hpp
index bfcc272aa24e7b919751881c905362457a5af26f..6bc537d6e31c4865a2c179a58c66c3e1992ae0da 100644
--- a/objectstore/GenericObject.hpp
+++ b/objectstore/GenericObject.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/Helpers.cpp b/objectstore/Helpers.cpp
index 6a37efd94901e1ebbd0fb54d9837dab6707b9be4..f5b0ab5fa3e74d4c59fecbc05011910c055aec87 100644
--- a/objectstore/Helpers.cpp
+++ b/objectstore/Helpers.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/Helpers.hpp b/objectstore/Helpers.hpp
index 21a372142723936f0f22a36ab26cd8be0cd91157..6c117641cd0b548543c2cbaf2e7a3b2d3bdd95b7 100644
--- a/objectstore/Helpers.hpp
+++ b/objectstore/Helpers.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/JobQueueType.cpp b/objectstore/JobQueueType.cpp
index a7378d2aa5831478ed9cfa4e4e747d7061f1dfdd..bdc6f30faacc2a06ae4edf6c002f4db7fa71c991 100644
--- a/objectstore/JobQueueType.cpp
+++ b/objectstore/JobQueueType.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/JobQueueType.hpp b/objectstore/JobQueueType.hpp
index 9cb8190b2f152f3a38f9ba04ae07430576b6b537..4ff8e00e17c3f8f639081fde385db7cae6102b45 100644
--- a/objectstore/JobQueueType.hpp
+++ b/objectstore/JobQueueType.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/LifecycleTimingsSerDeser.hpp b/objectstore/LifecycleTimingsSerDeser.hpp
index af2133c99fadb0adaa81e3c31965a64ad5abeff4..98f910631c97d2a97aa37671fa91657d0675ce29 100644
--- a/objectstore/LifecycleTimingsSerDeser.hpp
+++ b/objectstore/LifecycleTimingsSerDeser.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/MountPolicySerDeser.hpp b/objectstore/MountPolicySerDeser.hpp
index 04cf286e8800ef98c1e800e5314cd14561206838..308eac6684f6a139b3d7a714ff460f7bb619d6b6 100644
--- a/objectstore/MountPolicySerDeser.hpp
+++ b/objectstore/MountPolicySerDeser.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/ObjectOps.cpp b/objectstore/ObjectOps.cpp
index 5ae6bb1538b55122e6a8d333c12cffe3a110a59a..b0df047b63c70697cf827ba90d8612b8d25ef52d 100644
--- a/objectstore/ObjectOps.cpp
+++ b/objectstore/ObjectOps.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/ObjectOps.hpp b/objectstore/ObjectOps.hpp
index 206c39fc3556d7235b4e0185ebcb9add14bc9a82..234d3a6180f068cdc4291c6b9709a80a033f1aec 100644
--- a/objectstore/ObjectOps.hpp
+++ b/objectstore/ObjectOps.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/ProtobufCleaner.cpp b/objectstore/ProtobufCleaner.cpp
index d2c68c5143ee05d9bee196053ef57466b4fa7a99..a2d0c30d8d06a0d250eeb00c87efa24d0fc2a6ec 100644
--- a/objectstore/ProtobufCleaner.cpp
+++ b/objectstore/ProtobufCleaner.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/ProtocolBuffersAlgorithms.cpp b/objectstore/ProtocolBuffersAlgorithms.cpp
index c5c75da63607b6ab144212e32fd29098e1c2b882..196ca87023492fe0ce7c45d8e5bd7d1d33a83f34 100644
--- a/objectstore/ProtocolBuffersAlgorithms.cpp
+++ b/objectstore/ProtocolBuffersAlgorithms.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/ProtocolBuffersAlgorithms.hpp b/objectstore/ProtocolBuffersAlgorithms.hpp
index f1097c6fdff457f0627e946677efaac794c48093..c1bba39cee1a0a046bc167d217f490b81dfe3e71 100644
--- a/objectstore/ProtocolBuffersAlgorithms.hpp
+++ b/objectstore/ProtocolBuffersAlgorithms.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RepackIndex.cpp b/objectstore/RepackIndex.cpp
index 6465035df18eff7d2058ee8aee30072de80c0e6b..0171833586187880a7093f963b1361b1c15b6d72 100644
--- a/objectstore/RepackIndex.cpp
+++ b/objectstore/RepackIndex.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RepackIndex.hpp b/objectstore/RepackIndex.hpp
index a5e79fe46561be21a3218d3bed348e43e2640607..42688184447d25ab3b59e493ff99b7217a2e5cda 100644
--- a/objectstore/RepackIndex.hpp
+++ b/objectstore/RepackIndex.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RepackQueue.cpp b/objectstore/RepackQueue.cpp
index 489311878a1ff163d9c93716b74e0aaea7281f90..9205545abc820b6954f811b81b806af5ef5509d3 100644
--- a/objectstore/RepackQueue.cpp
+++ b/objectstore/RepackQueue.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RepackQueue.hpp b/objectstore/RepackQueue.hpp
index bf475332c913bcf3ee684aac36c02ef08d5738e1..0209781f3e7a1343afc77b029a5e78239ad4e602 100644
--- a/objectstore/RepackQueue.hpp
+++ b/objectstore/RepackQueue.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RepackQueueAlgorithms.hpp b/objectstore/RepackQueueAlgorithms.hpp
index 2464cca7a038ed6b8860843dd63a7cc8145d2f93..f9c037acc10262220feca340e30432c31c8276ba 100644
--- a/objectstore/RepackQueueAlgorithms.hpp
+++ b/objectstore/RepackQueueAlgorithms.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RepackQueuePendingAlgorithms.cpp b/objectstore/RepackQueuePendingAlgorithms.cpp
index 01362900de039f14693ed1fed40c8420cb83c527..18aaafa44ee5b4f421b35bce041354b91ad99564 100644
--- a/objectstore/RepackQueuePendingAlgorithms.cpp
+++ b/objectstore/RepackQueuePendingAlgorithms.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RepackQueueToExpandAlgorithms.cpp b/objectstore/RepackQueueToExpandAlgorithms.cpp
index 35a09f8f0c146a0b45f6c2f8d385eee1a74f633d..182af3e66c8459300ede98fa012db837f24d9f34 100644
--- a/objectstore/RepackQueueToExpandAlgorithms.cpp
+++ b/objectstore/RepackQueueToExpandAlgorithms.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RepackRequest.cpp b/objectstore/RepackRequest.cpp
index 0ec9ecd5278c49142bc62b41679e293893a56e9d..98bae4fa07ed807aa06955d191fcca3e3d16bdc3 100644
--- a/objectstore/RepackRequest.cpp
+++ b/objectstore/RepackRequest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RepackRequest.hpp b/objectstore/RepackRequest.hpp
index f24ba88cb356d6c0f9f81d90db5f80595d7fd072..00f0e3238d7bd67c725db57562ec06ed528ae5f7 100644
--- a/objectstore/RepackRequest.hpp
+++ b/objectstore/RepackRequest.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RetrieveActivityCountMap.cpp b/objectstore/RetrieveActivityCountMap.cpp
index 4e9800dde8f46b1033d3ccb808dc4585c0fe5c2c..1e92b52a62f7e1df0315cdd53945d2529d286c96 100644
--- a/objectstore/RetrieveActivityCountMap.cpp
+++ b/objectstore/RetrieveActivityCountMap.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RetrieveActivityCountMap.hpp b/objectstore/RetrieveActivityCountMap.hpp
index 322347c3da1460ee2c38a74a8ada17404c958144..90a017f55e46aa347627bf307cb3fb9a46b188d0 100644
--- a/objectstore/RetrieveActivityCountMap.hpp
+++ b/objectstore/RetrieveActivityCountMap.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RetrieveQueue.cpp b/objectstore/RetrieveQueue.cpp
index b5ffc6207d07db74b7c479f4d6e2e38cd1dc3be1..ade91a29289ae06503c5248734edfec1a2989431 100644
--- a/objectstore/RetrieveQueue.cpp
+++ b/objectstore/RetrieveQueue.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RetrieveQueue.hpp b/objectstore/RetrieveQueue.hpp
index e27381f230795239c843706459c1654cc8fbba85..9ed21489c079f0a22afff58cb9badf842591ddd4 100644
--- a/objectstore/RetrieveQueue.hpp
+++ b/objectstore/RetrieveQueue.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RetrieveQueueAlgorithms.hpp b/objectstore/RetrieveQueueAlgorithms.hpp
index 75014e57f8e475b84ac63e9b05fac9a497ced895..dc27bc869b1efab3fb3035d307a5b4729d93238f 100644
--- a/objectstore/RetrieveQueueAlgorithms.hpp
+++ b/objectstore/RetrieveQueueAlgorithms.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RetrieveQueueFailedAlgorithms.cpp b/objectstore/RetrieveQueueFailedAlgorithms.cpp
index 04b65af011b176e4a97183e8bb9781b638113480..2408b8050101dcbdd6fb56a318cafa708c161663 100644
--- a/objectstore/RetrieveQueueFailedAlgorithms.cpp
+++ b/objectstore/RetrieveQueueFailedAlgorithms.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RetrieveQueueShard.cpp b/objectstore/RetrieveQueueShard.cpp
index 7927474d44577683099d8838b941bc74ece4eef6..420accd7dd6b9e6656798f8db0810e744982538a 100644
--- a/objectstore/RetrieveQueueShard.cpp
+++ b/objectstore/RetrieveQueueShard.cpp
@@ -1,7 +1,7 @@
 
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RetrieveQueueShard.hpp b/objectstore/RetrieveQueueShard.hpp
index 0eb2ddc388d4e75da2a84c38c9291f2fef755146..a3f3b020297f34b3c8ddc8e3adab7f7f6dc65ec0 100644
--- a/objectstore/RetrieveQueueShard.hpp
+++ b/objectstore/RetrieveQueueShard.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RetrieveQueueTest.cpp b/objectstore/RetrieveQueueTest.cpp
index 118feef4f7127a25f7c3e468c3c181b5c701f1aa..4e4f30ee268abb3401d94a5e186589b4a9e8310e 100644
--- a/objectstore/RetrieveQueueTest.cpp
+++ b/objectstore/RetrieveQueueTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RetrieveQueueToReportAlgorithms.cpp b/objectstore/RetrieveQueueToReportAlgorithms.cpp
index 9e2f261b20142ebc15a12f139f7b2992e0cbbbfd..218a63a48d4d36c8ebe8d228772c98fe42eec78f 100644
--- a/objectstore/RetrieveQueueToReportAlgorithms.cpp
+++ b/objectstore/RetrieveQueueToReportAlgorithms.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RetrieveQueueToReportToRepackForFailureAlgorithms.cpp b/objectstore/RetrieveQueueToReportToRepackForFailureAlgorithms.cpp
index 1634e49d016840c5b3eadf169e4395d0b76d7d56..24d015d74030b4bed45820cbf3edddba348d96d0 100644
--- a/objectstore/RetrieveQueueToReportToRepackForFailureAlgorithms.cpp
+++ b/objectstore/RetrieveQueueToReportToRepackForFailureAlgorithms.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RetrieveQueueToReportToRepackForSuccessAlgorithms.cpp b/objectstore/RetrieveQueueToReportToRepackForSuccessAlgorithms.cpp
index d398dc6aa1929d1a09dc705ce7ab169b0245a0c2..481ef5cbbc000d72be18f0de5a33546a85fa92de 100644
--- a/objectstore/RetrieveQueueToReportToRepackForSuccessAlgorithms.cpp
+++ b/objectstore/RetrieveQueueToReportToRepackForSuccessAlgorithms.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RetrieveQueueToTransferAlgorithms.cpp b/objectstore/RetrieveQueueToTransferAlgorithms.cpp
index 54a6ab7befb425c15ec373d31dc8588a61b881e9..34406db41a5b88aa8a63c586e894a0ac86562d93 100644
--- a/objectstore/RetrieveQueueToTransferAlgorithms.cpp
+++ b/objectstore/RetrieveQueueToTransferAlgorithms.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RetrieveRequest.cpp b/objectstore/RetrieveRequest.cpp
index 323570c3d34c6a3d8a1b5e0fb53808e0cae12ec8..2960a81115400c8021d0c3bb3f53fe84461ab8da 100644
--- a/objectstore/RetrieveRequest.cpp
+++ b/objectstore/RetrieveRequest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RetrieveRequest.hpp b/objectstore/RetrieveRequest.hpp
index 686cb8b7062a7fbdbcaad1f64837923dbf0a7680..ae2049a4acb9443c65e323b60ff53d97baf0e779 100644
--- a/objectstore/RetrieveRequest.hpp
+++ b/objectstore/RetrieveRequest.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RootEntry.cpp b/objectstore/RootEntry.cpp
index 126df4e71a38b26f210557a2a8001c3e5946f77f..f1353758655779f35b04166d582328808e40c6cc 100644
--- a/objectstore/RootEntry.cpp
+++ b/objectstore/RootEntry.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RootEntry.hpp b/objectstore/RootEntry.hpp
index 0832b235996db9656cecda9734a5eb448e181892..6a7192be5739a5235b5af7e8c2de0de5ef66d5dc 100644
--- a/objectstore/RootEntry.hpp
+++ b/objectstore/RootEntry.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/RootEntryTest.cpp b/objectstore/RootEntryTest.cpp
index 27f8b2865a2e72fcef331c66dfcb8ebfa94f0bc3..11630b932839de8217bd4be91e477463d01cec4b 100644
--- a/objectstore/RootEntryTest.cpp
+++ b/objectstore/RootEntryTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/SchedulerGlobalLock.cpp b/objectstore/SchedulerGlobalLock.cpp
index 3d9f1c48a18e783da60d89050016b138aac649c1..a14ec1e7dac8fb2f909c67fc57fc9911037d1f4c 100644
--- a/objectstore/SchedulerGlobalLock.cpp
+++ b/objectstore/SchedulerGlobalLock.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/SchedulerGlobalLock.hpp b/objectstore/SchedulerGlobalLock.hpp
index 69784d3cb827ec606d38cf9e104be6bd6fe4b29a..b143cd7e27d31af0b3ea336c4e27a95a286e4904 100644
--- a/objectstore/SchedulerGlobalLock.hpp
+++ b/objectstore/SchedulerGlobalLock.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/SerializersExceptions.hpp b/objectstore/SerializersExceptions.hpp
index defead42257eaaf704001757fd1a466c192772a0..c1c858c12ae9a12e9eae7d7b70694868054b096c 100644
--- a/objectstore/SerializersExceptions.hpp
+++ b/objectstore/SerializersExceptions.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/Sorter.cpp b/objectstore/Sorter.cpp
index 0b98a4f82fec89ed232ce0e8c0bffd37df33605d..1e1b13ba03804da290c6ba21531df9765b9c56f9 100644
--- a/objectstore/Sorter.cpp
+++ b/objectstore/Sorter.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/Sorter.hpp b/objectstore/Sorter.hpp
index 5c57ab3d4c863b157518d08969a1254eeefb219a..7da77309b4a1db9eea3c972b7b2fc555a1fafbdd 100644
--- a/objectstore/Sorter.hpp
+++ b/objectstore/Sorter.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/SorterArchiveJob.hpp b/objectstore/SorterArchiveJob.hpp
index 4847f556b8e48d82d4889ba77f259bf4eec7c92d..897f4be6cfb4efe30dc05dbe2ea7cddd8d3f05f3 100644
--- a/objectstore/SorterArchiveJob.hpp
+++ b/objectstore/SorterArchiveJob.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/SorterTest.cpp b/objectstore/SorterTest.cpp
index b13dc1e402f9383e96d54ba156549319f873c5a3..45f397f6ab36941054b5d8468285d5936f22a330 100644
--- a/objectstore/SorterTest.cpp
+++ b/objectstore/SorterTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/TapeFileSerDeser.hpp b/objectstore/TapeFileSerDeser.hpp
index 42aefd9e0660b5f249e8a75bc19c387c523b263b..4b884ab561c5f2e61bba0bed19155590032bcd48 100644
--- a/objectstore/TapeFileSerDeser.hpp
+++ b/objectstore/TapeFileSerDeser.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/ValueCountMap.cpp b/objectstore/ValueCountMap.cpp
index a9b30f678d3db6e699a5c5e3847071e1472b55c9..a06923359b40e4d5750cd18d430ddc6cd111bbbd 100644
--- a/objectstore/ValueCountMap.cpp
+++ b/objectstore/ValueCountMap.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/ValueCountMap.hpp b/objectstore/ValueCountMap.hpp
index 06728a5dc530ef1e5ee4a05c31d64ec78ac0228b..e3a32710812c810633e990af36bce7b60a54509c 100644
--- a/objectstore/ValueCountMap.hpp
+++ b/objectstore/ValueCountMap.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/cta-objectstore-collect-orphaned-object.cpp b/objectstore/cta-objectstore-collect-orphaned-object.cpp
index 2b8193b6604fd3f2c8824c954222d7c52fafb957..e59546d10f388bcf4e27900c61f7aed125699316 100644
--- a/objectstore/cta-objectstore-collect-orphaned-object.cpp
+++ b/objectstore/cta-objectstore-collect-orphaned-object.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/cta-objectstore-create-missing-repack-index.cpp b/objectstore/cta-objectstore-create-missing-repack-index.cpp
index 6deabffdcfc93c4bd50e1ac7d200e3c680543b86..c5b6af8c2b61d16210616013d41e30e36216d28c 100644
--- a/objectstore/cta-objectstore-create-missing-repack-index.cpp
+++ b/objectstore/cta-objectstore-create-missing-repack-index.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/cta-objectstore-dereference-removed-queues.cpp b/objectstore/cta-objectstore-dereference-removed-queues.cpp
index 5ca0b81e6197557164ccd1dbde9cedf3b0df62a8..00f6c49d268276edef48049d1725c819ddac96e3 100644
--- a/objectstore/cta-objectstore-dereference-removed-queues.cpp
+++ b/objectstore/cta-objectstore-dereference-removed-queues.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/cta-objectstore-dump-object.cpp b/objectstore/cta-objectstore-dump-object.cpp
index 4e244bd3ffe9c33dfdb0bffa8093bea9f60dacc1..d5cdea76c2578bd66e96ff7b8ad0201c19e3ac0b 100644
--- a/objectstore/cta-objectstore-dump-object.cpp
+++ b/objectstore/cta-objectstore-dump-object.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/cta-objectstore-initialize.cpp b/objectstore/cta-objectstore-initialize.cpp
index e50192121fe0514b1d06b2e9a764d928ddde89d6..3509fa943643f7e78747ba528befb04351acb13a 100644
--- a/objectstore/cta-objectstore-initialize.cpp
+++ b/objectstore/cta-objectstore-initialize.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/objectstore/cta-objectstore-list.cpp b/objectstore/cta-objectstore-list.cpp
index 9f948873de832184041d18d4f7d8a7cdb54de5b6..a7953808363cc4bb201a88e6b7b03df3c1519614 100644
--- a/objectstore/cta-objectstore-list.cpp
+++ b/objectstore/cta-objectstore-list.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/AutoRollback.cpp b/rdbms/AutoRollback.cpp
index 96196204eef06ea520c691e63c38092eece8c2f4..37851a8b9c0b67b1a024b7ed0a730076a3215997 100644
--- a/rdbms/AutoRollback.cpp
+++ b/rdbms/AutoRollback.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/AutoRollback.hpp b/rdbms/AutoRollback.hpp
index d4dbef909d1ab418a256d6d4c384911ea4dce9be..ddcf9c7260ba69b860539910c1945171ffebd585 100644
--- a/rdbms/AutoRollback.hpp
+++ b/rdbms/AutoRollback.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/AutocommitMode.hpp b/rdbms/AutocommitMode.hpp
index 6fc2e934afbf1a7cdc352dd30beb4a12479ab8e4..3df1373b49e66cd43d98c76718656e499be0b4db 100644
--- a/rdbms/AutocommitMode.hpp
+++ b/rdbms/AutocommitMode.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/CheckConstraintError.cpp b/rdbms/CheckConstraintError.cpp
index aff2f31dfbc15a11f41b35c225d9ba7d19579ca8..6755a74ef54dbccef8642c375db9f95d958e819c 100644
--- a/rdbms/CheckConstraintError.cpp
+++ b/rdbms/CheckConstraintError.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/CheckConstraintError.hpp b/rdbms/CheckConstraintError.hpp
index 8b33c4baf40edd711ce384c5384851d97eca6cc4..bccc45b59bd26a8f779055c3dc66cf2a156674ca 100644
--- a/rdbms/CheckConstraintError.hpp
+++ b/rdbms/CheckConstraintError.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/Conn.cpp b/rdbms/Conn.cpp
index 3a986cc9c1cdb2e32469584c8c4c5505364c3843..8ed6371906332c8488060045cee00fd85c8955ed 100644
--- a/rdbms/Conn.cpp
+++ b/rdbms/Conn.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/Conn.hpp b/rdbms/Conn.hpp
index 9a38a3392045b565b905ec80044a5684c97af023..519b3fb95eb79daeacb76c7c50693cd6f9dd0998 100644
--- a/rdbms/Conn.hpp
+++ b/rdbms/Conn.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/ConnAndStmts.hpp b/rdbms/ConnAndStmts.hpp
index cf303f03ae64d9939057ede7c7b4ee366d04e022..80e11c710db789d672f85269882d2b288f831e3a 100644
--- a/rdbms/ConnAndStmts.hpp
+++ b/rdbms/ConnAndStmts.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/ConnPool.cpp b/rdbms/ConnPool.cpp
index 60b1b16cc3b27b6b437f0edabd1f762777b3987d..7a8a93c1c767cfdf776eda7e666182b491513e99 100644
--- a/rdbms/ConnPool.cpp
+++ b/rdbms/ConnPool.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/ConnPool.hpp b/rdbms/ConnPool.hpp
index 6eed834797be980cdba82d3f9d378be2d8423bb4..0f4aff34b10f073936caed84a4d8392bb1781932 100644
--- a/rdbms/ConnPool.hpp
+++ b/rdbms/ConnPool.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/ConnPoolTest.cpp b/rdbms/ConnPoolTest.cpp
index ca8be481f146d8841d4f3eac683ab96e5a11a1d3..f0442d54d05875ba7962c616d3736c49f666c743 100644
--- a/rdbms/ConnPoolTest.cpp
+++ b/rdbms/ConnPoolTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/ConnTest.cpp b/rdbms/ConnTest.cpp
index 16c81913fceeab22301094e13a385689e1f98f58..029907a7f8b15fc758ec7e52a21ff580a5b9ee6f 100644
--- a/rdbms/ConnTest.cpp
+++ b/rdbms/ConnTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/ConnTest.hpp b/rdbms/ConnTest.hpp
index 64cc874fd141f6438d51100669f696988b98d0e7..c4c048f92dcc0d57650a49859f12a6a585eaa354 100644
--- a/rdbms/ConnTest.hpp
+++ b/rdbms/ConnTest.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/Constants.hpp b/rdbms/Constants.hpp
index 604630e4a9f08520916d59b267b7417aea32af87..a68cf553165604653b980be8fbff6d43158f6645 100644
--- a/rdbms/Constants.hpp
+++ b/rdbms/Constants.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/ConstraintError.cpp b/rdbms/ConstraintError.cpp
index 5c35ed2f7d9082bbd637e921d74e162cb461ec88..a148952f8a9c939315fbe7c202b839381788f814 100644
--- a/rdbms/ConstraintError.cpp
+++ b/rdbms/ConstraintError.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/ConstraintError.hpp b/rdbms/ConstraintError.hpp
index b291eba59e83caec1e4991dfa68a43dcedcd702b..f84fe29b024b14b4b985e0951c5e4241f9b4361c 100644
--- a/rdbms/ConstraintError.hpp
+++ b/rdbms/ConstraintError.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/DbConfigVersionOfConnTest.cpp b/rdbms/DbConfigVersionOfConnTest.cpp
index a68cbed4f65be5cb715cf8dd45d30ecef3d33240..4cc0e3b464e83545be2114c1b260f648efe7d4b4 100644
--- a/rdbms/DbConfigVersionOfConnTest.cpp
+++ b/rdbms/DbConfigVersionOfConnTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/DbConfigVersionOfStmtTest.cpp b/rdbms/DbConfigVersionOfStmtTest.cpp
index b8243fb550cf1f6d9916de005ff4d8fff807dd52..416d9cec268f181c7ace28de284d25c68276be30 100644
--- a/rdbms/DbConfigVersionOfStmtTest.cpp
+++ b/rdbms/DbConfigVersionOfStmtTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/InMemoryVersionOfConnTest.cpp b/rdbms/InMemoryVersionOfConnTest.cpp
index 94a6e3f64061767ec00a189b054e02545bffd222..113c3ec28d2f586f2af59df39f3eb3643a9a5db6 100644
--- a/rdbms/InMemoryVersionOfConnTest.cpp
+++ b/rdbms/InMemoryVersionOfConnTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/InMemoryVersionOfStmtTest.cpp b/rdbms/InMemoryVersionOfStmtTest.cpp
index 79b958f66f6fbdfa1ed54983d8e3c8aa012b2d5f..fa0d8b9382d44d499e65cfe86c20e5a6e3349756 100644
--- a/rdbms/InMemoryVersionOfStmtTest.cpp
+++ b/rdbms/InMemoryVersionOfStmtTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/InvalidResultSet.hpp b/rdbms/InvalidResultSet.hpp
index 282790894122a4723e80a4f62a5c11c4184a6e01..b4adb3e4ad4fe671efa6a2c33dc717e0983a16f4 100644
--- a/rdbms/InvalidResultSet.hpp
+++ b/rdbms/InvalidResultSet.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/Login.cpp b/rdbms/Login.cpp
index 51927ce77656082b7e56f4466cf4aa047190ee2f..26c82f319924651b246638c52cf41d53ad4687d3 100644
--- a/rdbms/Login.cpp
+++ b/rdbms/Login.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/Login.hpp b/rdbms/Login.hpp
index 8d5fcc9f3d8a022d2113eda43a6d0de0e5315935..8fb2539b44ea1e878df74d99899fd1e338c5749c 100644
--- a/rdbms/Login.hpp
+++ b/rdbms/Login.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/LoginFactory.cpp b/rdbms/LoginFactory.cpp
index 4d163799e8a014334f0d82dd5bddd2a9c416f0dd..2e1fe2c43fd01d9b4bf53f6042426f6f3a0c74a7 100644
--- a/rdbms/LoginFactory.cpp
+++ b/rdbms/LoginFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/LoginFactory.hpp b/rdbms/LoginFactory.hpp
index 441dc631c56b465a1a50247c4be85ccbd6f57824..c32a7f204cc03d82c06a9139ae330e57a7e40aaf 100644
--- a/rdbms/LoginFactory.hpp
+++ b/rdbms/LoginFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/LoginTest.cpp b/rdbms/LoginTest.cpp
index bfd9d9d81aef3c7a2ab2d21caa5d962878412b10..b19bde76969d7468e2db85ef7f18d7d38c6bca13 100644
--- a/rdbms/LoginTest.cpp
+++ b/rdbms/LoginTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/NullDbValue.cpp b/rdbms/NullDbValue.cpp
index 877e5e2cc7537131f71056d8ec93132e225b7f50..0f757b4ff1255dca53b36ed5533d8e1bc76c061d 100644
--- a/rdbms/NullDbValue.cpp
+++ b/rdbms/NullDbValue.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/NullDbValue.hpp b/rdbms/NullDbValue.hpp
index da84954b06c5dcd297473fe17870d7c5316a20be..cfab57f739f56a5672fbef59389f5579db187797 100644
--- a/rdbms/NullDbValue.hpp
+++ b/rdbms/NullDbValue.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/PrimaryKeyError.cpp b/rdbms/PrimaryKeyError.cpp
index a71d230e20fe1eed8f5e32df0542925867f59afc..75ac1db7264f653706c7d5f2e37f51295218a982 100644
--- a/rdbms/PrimaryKeyError.cpp
+++ b/rdbms/PrimaryKeyError.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/PrimaryKeyError.hpp b/rdbms/PrimaryKeyError.hpp
index db75933bd6cddefab106be9041c4b841c59cdc76..9b265e70d54fdb804dea10e6da8f2343ef79e944 100644
--- a/rdbms/PrimaryKeyError.hpp
+++ b/rdbms/PrimaryKeyError.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/RdbmsTest.cpp b/rdbms/RdbmsTest.cpp
index 0acfa659b60856202cbd836e4a169144a0fc925e..5a672569dfd19440bb4faa2e3e64cdd4e84572d9 100644
--- a/rdbms/RdbmsTest.cpp
+++ b/rdbms/RdbmsTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/Rset.cpp b/rdbms/Rset.cpp
index 03eb81d919dd6770ccfb9239c0760e0c5ebf608c..bdbb46d6a32d05c52ea3e8b74b424597d4fcef03 100644
--- a/rdbms/Rset.cpp
+++ b/rdbms/Rset.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/Rset.hpp b/rdbms/Rset.hpp
index d679f25f2407ee52c4e76915dd5a26c61bd2c2f4..be99bf9be272e0166c77044974d81c53c36077b8 100644
--- a/rdbms/Rset.hpp
+++ b/rdbms/Rset.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/RsetTest.cpp b/rdbms/RsetTest.cpp
index f993c3e1bffacd5241c5c6d8be8ba47fb0224759..c83412e74d4fd871c245bd5e96ab221cae2fc66b 100644
--- a/rdbms/RsetTest.cpp
+++ b/rdbms/RsetTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/Stmt.cpp b/rdbms/Stmt.cpp
index 3c35fb7ae29599492b4b2f086545e602da50f287..3f4e45281c50924afb5744e4d7c8ecab36b3a214 100644
--- a/rdbms/Stmt.cpp
+++ b/rdbms/Stmt.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/Stmt.hpp b/rdbms/Stmt.hpp
index ce6a892b9cfdc0418855c7290514be3c69fccabd..030047d861f1bda8ad57f19c11b15a209e215a90 100644
--- a/rdbms/Stmt.hpp
+++ b/rdbms/Stmt.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/StmtPool.cpp b/rdbms/StmtPool.cpp
index 4a3964ed6d7c512dfbbc6954ff13308e2ca20773..a171cd7ff63dcca20e5b1bc0bf9454400c2ffca0 100644
--- a/rdbms/StmtPool.cpp
+++ b/rdbms/StmtPool.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/StmtPool.hpp b/rdbms/StmtPool.hpp
index edae894c911dd08374a1640f6437cd8dd1cb2c27..bcbb8788ffb575395f5ebddaf690f6119ad4d4a6 100644
--- a/rdbms/StmtPool.hpp
+++ b/rdbms/StmtPool.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/StmtPoolTest.cpp b/rdbms/StmtPoolTest.cpp
index 6424f16d2d3af3319318eba3ec51aa17dbd8c6f5..6d64493b5c2904946266e63b6e2b84e7702b94fd 100644
--- a/rdbms/StmtPoolTest.cpp
+++ b/rdbms/StmtPoolTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/StmtTest.cpp b/rdbms/StmtTest.cpp
index 6b9c975d7f422ac8c86558fe9ce7ef281e0131b6..4c2a5441ed243f33af6f0567dec4d5095a66e252 100644
--- a/rdbms/StmtTest.cpp
+++ b/rdbms/StmtTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/StmtTest.hpp b/rdbms/StmtTest.hpp
index cab710ca91f8461563b7553cb05764551defc608..1cb5a9d3500c2f1464eeda8144065a049a3d2c7f 100644
--- a/rdbms/StmtTest.hpp
+++ b/rdbms/StmtTest.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/UniqueError.cpp b/rdbms/UniqueError.cpp
index d8ca4fd834e5e3de5069f31f77d5fbb4f913e9c4..bc2dc9f9a0342d9b0b4ef63f3ab4947126ee5c06 100644
--- a/rdbms/UniqueError.cpp
+++ b/rdbms/UniqueError.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/UniqueError.hpp b/rdbms/UniqueError.hpp
index ab38875ec60b2be70550d757d8ca00421129ceed..68d7d8a8a969e9c4e1280e951ddc55e6e86926d0 100644
--- a/rdbms/UniqueError.hpp
+++ b/rdbms/UniqueError.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/rdbms.cpp b/rdbms/rdbms.cpp
index 812e319c8d6cf4efb35976f3f3eb385c0082bf28..acfd3e1d7d7edba2f78c9870bc361fb80fc8cdf4 100644
--- a/rdbms/rdbms.cpp
+++ b/rdbms/rdbms.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/rdbms.hpp b/rdbms/rdbms.hpp
index d63ee9128422637ee60ad044b1fa8382f868c321..5c0bac6f841bb9d1825356d0a82524d6bc3ecee9 100644
--- a/rdbms/rdbms.hpp
+++ b/rdbms/rdbms.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/ColumnNameToIdx.cpp b/rdbms/wrapper/ColumnNameToIdx.cpp
index 72be9735851bc0e8e1b09dc76e12fa740f25e500..8d3d73b0e18163c9370c4ac77438a62d49385cb5 100644
--- a/rdbms/wrapper/ColumnNameToIdx.cpp
+++ b/rdbms/wrapper/ColumnNameToIdx.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/ColumnNameToIdx.hpp b/rdbms/wrapper/ColumnNameToIdx.hpp
index e7e034fdb4203468dcd83d900be22cb8c008ebd7..5436248f224d986a34d9c67f016795edf96cb069 100644
--- a/rdbms/wrapper/ColumnNameToIdx.hpp
+++ b/rdbms/wrapper/ColumnNameToIdx.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/ColumnNameToIdxAndType.cpp b/rdbms/wrapper/ColumnNameToIdxAndType.cpp
index f3c5fb8c376c361499120927014f31c087468c03..2cfa1243c3d040aea7f527a5526c952251b710b5 100644
--- a/rdbms/wrapper/ColumnNameToIdxAndType.cpp
+++ b/rdbms/wrapper/ColumnNameToIdxAndType.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/ColumnNameToIdxAndType.hpp b/rdbms/wrapper/ColumnNameToIdxAndType.hpp
index debf24afa28f462ccee2ec4298bcb81e8aca60a0..6a0a931656c0a0465da895fd2870bbf267ed6049 100644
--- a/rdbms/wrapper/ColumnNameToIdxAndType.hpp
+++ b/rdbms/wrapper/ColumnNameToIdxAndType.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/ConnFactory.cpp b/rdbms/wrapper/ConnFactory.cpp
index 76802ed056232befdbdae135cb1e2d3f0306169b..494f778339790b43d66c48731d251f56d80b2011 100644
--- a/rdbms/wrapper/ConnFactory.cpp
+++ b/rdbms/wrapper/ConnFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/ConnFactory.hpp b/rdbms/wrapper/ConnFactory.hpp
index 9f13aee543b5c8b98214ed28bf8018642642a657..1fa1efb4e10b733424af3b88757539d8599c2d9a 100644
--- a/rdbms/wrapper/ConnFactory.hpp
+++ b/rdbms/wrapper/ConnFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/ConnFactoryFactory.cpp b/rdbms/wrapper/ConnFactoryFactory.cpp
index 337f693c92c24734ca7b34e8f0a0ebf1eb6270e8..fe36be646857e55221eb3eabadc50082532c6c35 100644
--- a/rdbms/wrapper/ConnFactoryFactory.cpp
+++ b/rdbms/wrapper/ConnFactoryFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/ConnFactoryFactory.hpp b/rdbms/wrapper/ConnFactoryFactory.hpp
index 2d1c2da26981b9734047b35d479a8d37401ce2fe..9a718fab9ebe78a30d77193d76b85efb28048611 100644
--- a/rdbms/wrapper/ConnFactoryFactory.hpp
+++ b/rdbms/wrapper/ConnFactoryFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/ConnTest.cpp b/rdbms/wrapper/ConnTest.cpp
index 7769ffac2d1e9b4ebcfe8b3412c867a6745c06ab..7c776f9e6d4518d97d6f72e23d6524dc42f66e6c 100644
--- a/rdbms/wrapper/ConnTest.cpp
+++ b/rdbms/wrapper/ConnTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/ConnWrapper.cpp b/rdbms/wrapper/ConnWrapper.cpp
index c44dda8e3da3c47e8aae711ab3761c7fd0abf62b..a0fd0e57d890c0ef4d92fc1ef4d2e9da81cb02c8 100644
--- a/rdbms/wrapper/ConnWrapper.cpp
+++ b/rdbms/wrapper/ConnWrapper.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/ConnWrapper.hpp b/rdbms/wrapper/ConnWrapper.hpp
index 40ecbe2b358157e3cf2f77d5b77542ce94e83bd7..7078266ab1a160fc5ed758fcea7b73652082496d 100644
--- a/rdbms/wrapper/ConnWrapper.hpp
+++ b/rdbms/wrapper/ConnWrapper.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/Mysql.cpp b/rdbms/wrapper/Mysql.cpp
index 0cff4231610db566bfbb5e214e6d843f50a7d150..180fd9d561b13596e9ed525235d89366b39b0873 100644
--- a/rdbms/wrapper/Mysql.cpp
+++ b/rdbms/wrapper/Mysql.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/Mysql.hpp b/rdbms/wrapper/Mysql.hpp
index ab7c52096c183d9700107452d987b19a27ecf467..b5827fd77a0f6fa74afe8de2d8a002d3892dcc9f 100644
--- a/rdbms/wrapper/Mysql.hpp
+++ b/rdbms/wrapper/Mysql.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/MysqlConn.cpp b/rdbms/wrapper/MysqlConn.cpp
index 877fcb8c0cabe99415dafc1b947bead43369373c..5e53deee68aca6fd6188dbae04f2514ba92e477e 100644
--- a/rdbms/wrapper/MysqlConn.cpp
+++ b/rdbms/wrapper/MysqlConn.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/MysqlConn.hpp b/rdbms/wrapper/MysqlConn.hpp
index e770273f8995f1e74b211af8494b4ee98eef4e34..8f2598ccb57e109bf6ebc2c027ab43b579ad703c 100644
--- a/rdbms/wrapper/MysqlConn.hpp
+++ b/rdbms/wrapper/MysqlConn.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/MysqlConnFactory.cpp b/rdbms/wrapper/MysqlConnFactory.cpp
index 2660cbd15223da84f4a7b2942e17b930fd418920..60c853d849721790a625e3720cda452c27440644 100644
--- a/rdbms/wrapper/MysqlConnFactory.cpp
+++ b/rdbms/wrapper/MysqlConnFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/MysqlConnFactory.hpp b/rdbms/wrapper/MysqlConnFactory.hpp
index baab1d5fef7986ad23e6a107384219159d93e130..aba8fa6912f0fd59d8d5577e63043deb8747b8f9 100644
--- a/rdbms/wrapper/MysqlConnFactory.hpp
+++ b/rdbms/wrapper/MysqlConnFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/MysqlConnTest.cpp b/rdbms/wrapper/MysqlConnTest.cpp
index ac7c0e362edbe69a515826dc715c73c2d92283b6..58df957e2b478022e304bbcc613583e5acb998e7 100644
--- a/rdbms/wrapper/MysqlConnTest.cpp
+++ b/rdbms/wrapper/MysqlConnTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/MysqlRset.cpp b/rdbms/wrapper/MysqlRset.cpp
index 3de111c6d7d00b290f5624dc548d855fddd42087..7c8fb29d87073c95a7b0ac47a3231c7b64840cb0 100644
--- a/rdbms/wrapper/MysqlRset.cpp
+++ b/rdbms/wrapper/MysqlRset.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/MysqlRset.hpp b/rdbms/wrapper/MysqlRset.hpp
index d15ca1dc1336f031a1905963d6dee4a1db6a70ed..a43f61fedd3e9e58aa758f2d8bd79d5e95f57207 100644
--- a/rdbms/wrapper/MysqlRset.hpp
+++ b/rdbms/wrapper/MysqlRset.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/MysqlStmt.cpp b/rdbms/wrapper/MysqlStmt.cpp
index b3faa3377c1bd5b35cc9e2428d69eff2c55b2392..82aabdd5ae80a36980f9ce9e16c1bae8e205ee2e 100644
--- a/rdbms/wrapper/MysqlStmt.cpp
+++ b/rdbms/wrapper/MysqlStmt.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/MysqlStmt.hpp b/rdbms/wrapper/MysqlStmt.hpp
index 96e4c7bf2d0741b53fb055dac294cd6e64309461..8f8e713326427ff26018281b26aca9522a177ee2 100644
--- a/rdbms/wrapper/MysqlStmt.hpp
+++ b/rdbms/wrapper/MysqlStmt.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/OcciColumn.cpp b/rdbms/wrapper/OcciColumn.cpp
index 00db1a255e76a01a346ae93a795e5cac2d872075..7b6aeb1a41b8726880a7c586a7470f8870663b31 100644
--- a/rdbms/wrapper/OcciColumn.cpp
+++ b/rdbms/wrapper/OcciColumn.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/OcciColumn.hpp b/rdbms/wrapper/OcciColumn.hpp
index c009d4d7189499af4306e6564963b5b0ca2bf046..7e5baeae6e1b6ce417238336e61e461d6d2982ff 100644
--- a/rdbms/wrapper/OcciColumn.hpp
+++ b/rdbms/wrapper/OcciColumn.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/OcciColumnTest.cpp b/rdbms/wrapper/OcciColumnTest.cpp
index 2b3a6c9e44caded637df5684c4b0a7b8a7fcfe23..2ca32f7a1d7e6664fd88ef749c9e3ddd79369372 100644
--- a/rdbms/wrapper/OcciColumnTest.cpp
+++ b/rdbms/wrapper/OcciColumnTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/OcciConn.cpp b/rdbms/wrapper/OcciConn.cpp
index 2f89776e572f7818971f98f5be69d5ba2a177a43..c1f9c82e93ad42b74d54d81aa63e6ac0a4e55a91 100644
--- a/rdbms/wrapper/OcciConn.cpp
+++ b/rdbms/wrapper/OcciConn.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/OcciConn.hpp b/rdbms/wrapper/OcciConn.hpp
index 35bc569fea7378e3460d936621e53e4fa9b313a0..1ce83b2ddb45a7a2d008cb9fc25548f5be644972 100644
--- a/rdbms/wrapper/OcciConn.hpp
+++ b/rdbms/wrapper/OcciConn.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/OcciConnFactory.cpp b/rdbms/wrapper/OcciConnFactory.cpp
index eec08d52a5edf9416a141a6cb125c4d8a5385765..be12a6cdc6bd849acedaa039b2dc30848888aedd 100644
--- a/rdbms/wrapper/OcciConnFactory.cpp
+++ b/rdbms/wrapper/OcciConnFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/OcciConnFactory.hpp b/rdbms/wrapper/OcciConnFactory.hpp
index 4646f28b7cfe445a0cdfb2569cfc22d5d549faa0..25441ca4cbb62bf22989521b51220cc273b2e83d 100644
--- a/rdbms/wrapper/OcciConnFactory.hpp
+++ b/rdbms/wrapper/OcciConnFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/OcciEnv.cpp b/rdbms/wrapper/OcciEnv.cpp
index 9bde3be8f4375ee4fe620a7f74fa87788f7ff08e..3d5ed32c0465301f16f83a8fa0f7a67bf7832f40 100644
--- a/rdbms/wrapper/OcciEnv.cpp
+++ b/rdbms/wrapper/OcciEnv.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/OcciEnv.hpp b/rdbms/wrapper/OcciEnv.hpp
index d4c3be08bc68dc72942e1c9506a42f0dafbf51c4..b879e74c3a75f0de10bfac88b1a39cb7ab5f32d1 100644
--- a/rdbms/wrapper/OcciEnv.hpp
+++ b/rdbms/wrapper/OcciEnv.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/OcciEnvSingleton.cpp b/rdbms/wrapper/OcciEnvSingleton.cpp
index 98d729994742a20cac056ee7fc31a785c419b0cd..779301bb6c4429067a39286a7786d08bf53f1647 100644
--- a/rdbms/wrapper/OcciEnvSingleton.cpp
+++ b/rdbms/wrapper/OcciEnvSingleton.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/OcciEnvSingleton.hpp b/rdbms/wrapper/OcciEnvSingleton.hpp
index ce79380692760da272a5bd40dcda7e81456297a5..7a72f2c61c91addcf16169f7b604038acfacb09a 100644
--- a/rdbms/wrapper/OcciEnvSingleton.hpp
+++ b/rdbms/wrapper/OcciEnvSingleton.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/OcciRset.cpp b/rdbms/wrapper/OcciRset.cpp
index c5e297f5a5492fdb91e5813292ffeeca7e8d614f..bdb9c1150a6148687aad72384af46e6346f98203 100644
--- a/rdbms/wrapper/OcciRset.cpp
+++ b/rdbms/wrapper/OcciRset.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/OcciRset.hpp b/rdbms/wrapper/OcciRset.hpp
index 0199fa5a9a990c99a7c541095940382974c52d36..5925e5681778cd4ec5227d93479b1666a1256dc4 100644
--- a/rdbms/wrapper/OcciRset.hpp
+++ b/rdbms/wrapper/OcciRset.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/OcciStmt.cpp b/rdbms/wrapper/OcciStmt.cpp
index 488cc0b3d2552b2b7925c56cecc3b673f0837c28..70b9cd1626ed379a6c7150f7c09d2ea234494b6b 100644
--- a/rdbms/wrapper/OcciStmt.cpp
+++ b/rdbms/wrapper/OcciStmt.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -333,10 +333,11 @@ bool OcciStmt::connShouldBeClosed(const oracle::occi::SQLException &ex) {
   case  3135:
   case 12170:
   case 12514:
+  case 12528:
+  case 12537:
   case 12541:
   case 12571:
   case 24338:
-  case 12537:
   case 25401:
   case 25409:
   case 32102:
diff --git a/rdbms/wrapper/OcciStmt.hpp b/rdbms/wrapper/OcciStmt.hpp
index 6cae4078ddab4d3ba3739f79a545ee818fd871b4..356bea82421cc0aacd82f3f7657a79d387415773 100644
--- a/rdbms/wrapper/OcciStmt.hpp
+++ b/rdbms/wrapper/OcciStmt.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/ParamNameToIdx.cpp b/rdbms/wrapper/ParamNameToIdx.cpp
index 0c2bbd54b1d53ceaed6a34bf16bd7c5ca8da0b8f..950336d6dcf9c0ba32661e48df3ba691d4816cac 100644
--- a/rdbms/wrapper/ParamNameToIdx.cpp
+++ b/rdbms/wrapper/ParamNameToIdx.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/ParamNameToIdx.hpp b/rdbms/wrapper/ParamNameToIdx.hpp
index 381bb9bd0f3f7c2572caa9256aaf93cea2e20705..e5c5cb97f8d0eb2fc8580ebc9266559f0d850c38 100644
--- a/rdbms/wrapper/ParamNameToIdx.hpp
+++ b/rdbms/wrapper/ParamNameToIdx.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/ParamNameToIdxTest.cpp b/rdbms/wrapper/ParamNameToIdxTest.cpp
index cabba94ffe5c53eea6eac5e490e46444bb8ed084..d98d7fe9a35917f8d97971493b918f51d4ccfd8b 100644
--- a/rdbms/wrapper/ParamNameToIdxTest.cpp
+++ b/rdbms/wrapper/ParamNameToIdxTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/Postgres.hpp b/rdbms/wrapper/Postgres.hpp
index 77da6f2f09d89634d9a6c6e954d1ad5a93efda01..b0bd8b652f61c4f916f75ab8d1b27d5fb107c939 100644
--- a/rdbms/wrapper/Postgres.hpp
+++ b/rdbms/wrapper/Postgres.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/PostgresColumn.cpp b/rdbms/wrapper/PostgresColumn.cpp
index 9c742d454d053677484bef936a5b4b5794544a01..d1886f121ad7ab98e04b9132b5389259e5e9d4ac 100644
--- a/rdbms/wrapper/PostgresColumn.cpp
+++ b/rdbms/wrapper/PostgresColumn.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/PostgresColumn.hpp b/rdbms/wrapper/PostgresColumn.hpp
index fb95df5309390a7ac0ff952ae264dd617b8f71d0..83c4e3c8257f41afa404ee5ef623a9d6b2908041 100644
--- a/rdbms/wrapper/PostgresColumn.hpp
+++ b/rdbms/wrapper/PostgresColumn.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/PostgresConn.cpp b/rdbms/wrapper/PostgresConn.cpp
index 9168ee8869b8c107ca15f33f68835169da2681dd..440c77d38366403b5e24f265e08c722b68053c41 100644
--- a/rdbms/wrapper/PostgresConn.cpp
+++ b/rdbms/wrapper/PostgresConn.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/PostgresConn.hpp b/rdbms/wrapper/PostgresConn.hpp
index bfd2763cc13fa40b11a771630b65e89dfa65986e..69e733a77303d6395f0643246e8be18099ce5baf 100644
--- a/rdbms/wrapper/PostgresConn.hpp
+++ b/rdbms/wrapper/PostgresConn.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/PostgresConnFactory.cpp b/rdbms/wrapper/PostgresConnFactory.cpp
index 043a65e9fcc4f3d55c248e7e8d0f41b6e436e0d2..3b36c42603bd19bd15a673275ecd95b0b5506ca3 100644
--- a/rdbms/wrapper/PostgresConnFactory.cpp
+++ b/rdbms/wrapper/PostgresConnFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/PostgresConnFactory.hpp b/rdbms/wrapper/PostgresConnFactory.hpp
index 8686687b90a7cb515ec21e65e66ff47cc24a8fd1..2d55cb48afcb13f8e468e842f60322466f5631c1 100644
--- a/rdbms/wrapper/PostgresConnFactory.hpp
+++ b/rdbms/wrapper/PostgresConnFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/PostgresRset.cpp b/rdbms/wrapper/PostgresRset.cpp
index ed005e84ee9a6cf725a6db37ec8bf259504bc469..30af81e897a9d199fd0321fbe94a3426ee5fbe8b 100644
--- a/rdbms/wrapper/PostgresRset.cpp
+++ b/rdbms/wrapper/PostgresRset.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/PostgresRset.hpp b/rdbms/wrapper/PostgresRset.hpp
index c357c43a53761aeb2df71d584dcc475f42b184f2..75c943365bb336ba1df53144035cf2afcc1d787a 100644
--- a/rdbms/wrapper/PostgresRset.hpp
+++ b/rdbms/wrapper/PostgresRset.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/PostgresStmt.cpp b/rdbms/wrapper/PostgresStmt.cpp
index 8a09483322e4f44def4088db70488798087a7e5b..a97499d464759d6910ae85d8ba3d3030d95eee32 100644
--- a/rdbms/wrapper/PostgresStmt.cpp
+++ b/rdbms/wrapper/PostgresStmt.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/PostgresStmt.hpp b/rdbms/wrapper/PostgresStmt.hpp
index 8f21e00505f0a5f5876cac990dd1823463e4b545..82b520e518155d1cf363906e53852438c46391b4 100644
--- a/rdbms/wrapper/PostgresStmt.hpp
+++ b/rdbms/wrapper/PostgresStmt.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/PostgresStmtTest.cpp b/rdbms/wrapper/PostgresStmtTest.cpp
index a35cd390fcce87480ab3c4cac921fe7fae15873e..f4df3fcf223cd5ce7dd6e66b6c218de6345f356a 100644
--- a/rdbms/wrapper/PostgresStmtTest.cpp
+++ b/rdbms/wrapper/PostgresStmtTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/RsetWrapper.cpp b/rdbms/wrapper/RsetWrapper.cpp
index cfd77860c931a4ee52e20f26983692d951dcab7d..08a0732a0eabb012dde46894b7d8b7755a4779b0 100644
--- a/rdbms/wrapper/RsetWrapper.cpp
+++ b/rdbms/wrapper/RsetWrapper.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/RsetWrapper.hpp b/rdbms/wrapper/RsetWrapper.hpp
index 865ccb7fc325020f802a9b130535be37f6d3d416..e0e7a92c771383b7a671e45fdeb6d3b38327a2b8 100644
--- a/rdbms/wrapper/RsetWrapper.hpp
+++ b/rdbms/wrapper/RsetWrapper.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/Sqlite.cpp b/rdbms/wrapper/Sqlite.cpp
index b4f0cc5e086a1e75337dfff2a2145698f323a5d5..e65f04583ed931bd0e542885e90bf5138ec94123 100644
--- a/rdbms/wrapper/Sqlite.cpp
+++ b/rdbms/wrapper/Sqlite.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/Sqlite.hpp b/rdbms/wrapper/Sqlite.hpp
index 60fe5d75bbc3520ac16e1739864928aa29268ccc..6f800273ee2a3477de2035d4f4dad5a102e4a73b 100644
--- a/rdbms/wrapper/Sqlite.hpp
+++ b/rdbms/wrapper/Sqlite.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/SqliteConn.cpp b/rdbms/wrapper/SqliteConn.cpp
index 84f8be5c31cc57616beecb6bd69811ba8e181adf..9060ae4dd4d0adaedf1d1a27e71e76784ee8f8c1 100644
--- a/rdbms/wrapper/SqliteConn.cpp
+++ b/rdbms/wrapper/SqliteConn.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/SqliteConn.hpp b/rdbms/wrapper/SqliteConn.hpp
index cf4d87612956f50a831698e0aa53978e158dd3a3..06e4457bca6e760add9f6f3008eafcb0bbf30093 100644
--- a/rdbms/wrapper/SqliteConn.hpp
+++ b/rdbms/wrapper/SqliteConn.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/SqliteConnFactory.cpp b/rdbms/wrapper/SqliteConnFactory.cpp
index 0fecbf8205a7e68ac9b57efcd14c5b51fb83ed0a..c6e76964c9abb2fd78a180bb43527662e446c1c7 100644
--- a/rdbms/wrapper/SqliteConnFactory.cpp
+++ b/rdbms/wrapper/SqliteConnFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/SqliteConnFactory.hpp b/rdbms/wrapper/SqliteConnFactory.hpp
index ede7728d964a0ec3daf7aad6a7551581140dd7c6..8a0f52f0c3cdf76fbb113c78a17a700ad0a6fb99 100644
--- a/rdbms/wrapper/SqliteConnFactory.hpp
+++ b/rdbms/wrapper/SqliteConnFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/SqliteRset.cpp b/rdbms/wrapper/SqliteRset.cpp
index 6e62dc21181ccd8bbd3944d6d2e0cb208a4486c2..46dee7e94ebd8629eb7580d71e26e68423c5674d 100644
--- a/rdbms/wrapper/SqliteRset.cpp
+++ b/rdbms/wrapper/SqliteRset.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/SqliteRset.hpp b/rdbms/wrapper/SqliteRset.hpp
index 106b7cef661bf72f383c600f65f1b6fa57e9fd7d..7a96b4f3bf375ddaf6c21c6b612fe41759f42821 100644
--- a/rdbms/wrapper/SqliteRset.hpp
+++ b/rdbms/wrapper/SqliteRset.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/SqliteStmt.cpp b/rdbms/wrapper/SqliteStmt.cpp
index bc8329cfb163dfbafaf797e0205f731692a7d19b..522aaadc14cafeb35ebe7640a8d514d09332b688 100644
--- a/rdbms/wrapper/SqliteStmt.cpp
+++ b/rdbms/wrapper/SqliteStmt.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/SqliteStmt.hpp b/rdbms/wrapper/SqliteStmt.hpp
index 4211911515f1805491edb9e116cf179fa9f016dc..95d2099ca50bbd5b3f057e10ee787d0d424018e8 100644
--- a/rdbms/wrapper/SqliteStmt.hpp
+++ b/rdbms/wrapper/SqliteStmt.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/SqliteStmtTest.cpp b/rdbms/wrapper/SqliteStmtTest.cpp
index 86b42a98eeec76a0a941c98e2a2c7e9fb35b2ed7..40e16d2323ff60d4a2f8ab211d976929ddc1a9c8 100644
--- a/rdbms/wrapper/SqliteStmtTest.cpp
+++ b/rdbms/wrapper/SqliteStmtTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/StmtWrapper.cpp b/rdbms/wrapper/StmtWrapper.cpp
index d83827c30102880ce25d78e1fb0fe07bef6c964f..51c87315ba29512ed7ca076828ccb478444cebe4 100644
--- a/rdbms/wrapper/StmtWrapper.cpp
+++ b/rdbms/wrapper/StmtWrapper.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/rdbms/wrapper/StmtWrapper.hpp b/rdbms/wrapper/StmtWrapper.hpp
index dd5b606330ca46448856bb2af1b43a6ffd2b2758..cac4d30b6efd65ea8fdea15e74fd026c19bc4749 100644
--- a/rdbms/wrapper/StmtWrapper.hpp
+++ b/rdbms/wrapper/StmtWrapper.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/ArchiveJob.cpp b/scheduler/ArchiveJob.cpp
index 859763a8662553f9380870d7fc9cb081e3487836..94a689fb1c2cc97835b1ab0fa314427a1c904098 100644
--- a/scheduler/ArchiveJob.cpp
+++ b/scheduler/ArchiveJob.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -87,7 +87,7 @@ void cta::ArchiveJob::validate(){
 }
 
 //------------------------------------------------------------------------------
-// ArchiveJob::reportURL
+// ArchiveJob::exceptionThrowingReportURL
 //------------------------------------------------------------------------------
 std::string cta::ArchiveJob::exceptionThrowingReportURL() {
   switch (m_dbJob->reportType) {
diff --git a/scheduler/ArchiveJob.hpp b/scheduler/ArchiveJob.hpp
index d5a392740c30a9c343db1d95af36821c9be573c2..5d3c43c9f39ced705bd9a79d0a62f03ed85e5bcd 100644
--- a/scheduler/ArchiveJob.hpp
+++ b/scheduler/ArchiveJob.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/ArchiveMount.cpp b/scheduler/ArchiveMount.cpp
index becae3214526091b124bb878ba1ce0ce38fd4449..33dfac79a48080714910d4f856775fca442b31a3 100644
--- a/scheduler/ArchiveMount.cpp
+++ b/scheduler/ArchiveMount.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/ArchiveMount.hpp b/scheduler/ArchiveMount.hpp
index 2982bbf7d854987f96a67d227186ee880d393283..17ae5cdd258919519258608a91f6efcf7e3324e6 100644
--- a/scheduler/ArchiveMount.hpp
+++ b/scheduler/ArchiveMount.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/DiskReportRunner.cpp b/scheduler/DiskReportRunner.cpp
index 60eb7768acdca776abe51b0104396c59579712d1..aced7a29ec2afa83e15631aac6b1e93a9db288ee 100644
--- a/scheduler/DiskReportRunner.cpp
+++ b/scheduler/DiskReportRunner.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/DiskReportRunner.hpp b/scheduler/DiskReportRunner.hpp
index 2e24a9ca9f405b29d3ef60545d9dd3e4276b0f28..56ccdf8ffe3a2cf5cd0c05604adca2d947129013 100644
--- a/scheduler/DiskReportRunner.hpp
+++ b/scheduler/DiskReportRunner.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/LabelMount.cpp b/scheduler/LabelMount.cpp
index 792391b4289b69aaf304d24a143a5d179fcafdf6..b42d6bffdb13aa3d1c27bbab5775cba877754188 100644
--- a/scheduler/LabelMount.cpp
+++ b/scheduler/LabelMount.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/LabelMount.hpp b/scheduler/LabelMount.hpp
index 8516cd5e9d210ef2cf86df0eff9ed05ff6e1f5ce..6cc9a617cf3b51fed86a55f51711cd8c1f21e3cf 100644
--- a/scheduler/LabelMount.hpp
+++ b/scheduler/LabelMount.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/LogicalLibrary.cpp b/scheduler/LogicalLibrary.cpp
index d2466cf3c052a9719414b20820654347786948b8..a505240167e64e62c5afb36ed6aeeb2165bda6a1 100644
--- a/scheduler/LogicalLibrary.cpp
+++ b/scheduler/LogicalLibrary.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/LogicalLibrary.hpp b/scheduler/LogicalLibrary.hpp
index f0d10a390a286d1ed42c483bc163c9bbd37e2b8f..848f7f384edbfaa4adb91efb2ed5747dde7b6e35 100644
--- a/scheduler/LogicalLibrary.hpp
+++ b/scheduler/LogicalLibrary.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/MountRequest.cpp b/scheduler/MountRequest.cpp
index 6da62009082204444d4d5fac51e7b7c7dbab7c67..e7ac5741316f53d501ffd26cbe20f71146c346f4 100644
--- a/scheduler/MountRequest.cpp
+++ b/scheduler/MountRequest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/MountRequest.hpp b/scheduler/MountRequest.hpp
index ac4156028fb619feca24636fdce09264d1491659..c7b2a1eec9723b506d5615707c0e83865d224f9e 100644
--- a/scheduler/MountRequest.hpp
+++ b/scheduler/MountRequest.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/MountType.cpp b/scheduler/MountType.cpp
index f24f49b0a247ae2a2535d745e0e96b71c08683bf..7e5c58e89659ae449512c7b9b816864b606619c0 100644
--- a/scheduler/MountType.cpp
+++ b/scheduler/MountType.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/MountType.hpp b/scheduler/MountType.hpp
index 6fbbef8f617be32f74246d852d8753c86a85cc59..a01507d816f20cc8c1d36a87c261d4783e53a360 100644
--- a/scheduler/MountType.hpp
+++ b/scheduler/MountType.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/OStoreDB/MemQueues.cpp b/scheduler/OStoreDB/MemQueues.cpp
index fe2af86ac69cac71335a6e6601e354aa5586b9fc..895116ba6bc1121d55207870b89dd0037d083e7d 100644
--- a/scheduler/OStoreDB/MemQueues.cpp
+++ b/scheduler/OStoreDB/MemQueues.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/OStoreDB/MemQueues.hpp b/scheduler/OStoreDB/MemQueues.hpp
index 6f5cc424471081a0cf0cadd6170d1c3db80f9ed4..24c67c88e92c52c8101ee5b651bb6894efdd89d5 100644
--- a/scheduler/OStoreDB/MemQueues.hpp
+++ b/scheduler/OStoreDB/MemQueues.hpp
@@ -1,7 +1,7 @@
 
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/OStoreDB/OStoreDB.cpp b/scheduler/OStoreDB/OStoreDB.cpp
index d058f0b4acb3ca7939cd5f2cf4dc4ffafc3a6dc3..63aa8664585d68bd164983102cbd52009aea7f29 100644
--- a/scheduler/OStoreDB/OStoreDB.cpp
+++ b/scheduler/OStoreDB/OStoreDB.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -4978,6 +4978,12 @@ void OStoreDB::ArchiveJob::failReport(const std::string& failureReason, log::Log
   typedef EnqueueingNextStep::NextStep NextStep;
   EnqueueingNextStep enQueueingNextStep =
       m_archiveRequest.addReportFailure(tapeFile.copyNb, m_mountId, failureLog, lc);
+  // Don't re-queue the job if reportType is set to NoReportRequired. This can happen if a previous
+  // attempt to report failed due to an exception, for example if the file was deleted on close.
+  if(reportType == ReportType::NoReportRequired) {
+    enQueueingNextStep.nextStep = NextStep::StoreInFailedJobsContainer;
+  }
+
   // First set the job status
   m_archiveRequest.setJobStatus(tapeFile.copyNb, enQueueingNextStep.nextStatus);
   // Now apply the decision.
diff --git a/scheduler/OStoreDB/OStoreDB.hpp b/scheduler/OStoreDB/OStoreDB.hpp
index 1ed8d2e5d71c6184e380bc0a6d0fee4fb0566c9c..36afd1d32b26c815ca41727621b881106cbceb7b 100644
--- a/scheduler/OStoreDB/OStoreDB.hpp
+++ b/scheduler/OStoreDB/OStoreDB.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/OStoreDB/OStoreDBFactory.hpp b/scheduler/OStoreDB/OStoreDBFactory.hpp
index 118eecb37babfdaa321c5febf20baa230eed353f..353895a3f04def64538138adbc1c74f689344cc8 100644
--- a/scheduler/OStoreDB/OStoreDBFactory.hpp
+++ b/scheduler/OStoreDB/OStoreDBFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/OStoreDB/OStoreDBInit.hpp b/scheduler/OStoreDB/OStoreDBInit.hpp
index dac0f904084d388fbc5ee789fb773e631ba7d044..c54eceed8800062ae2c332bb321e307939afc215 100644
--- a/scheduler/OStoreDB/OStoreDBInit.hpp
+++ b/scheduler/OStoreDB/OStoreDBInit.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/OStoreDB/OStoreDBTest.cpp b/scheduler/OStoreDB/OStoreDBTest.cpp
index 490418c205189b280d783d9355a704412693476a..ac0a70bd28d5c7ba3bc1072ff06f7f22af757a13 100644
--- a/scheduler/OStoreDB/OStoreDBTest.cpp
+++ b/scheduler/OStoreDB/OStoreDBTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/OStoreDB/OStoreDBTest.hpp b/scheduler/OStoreDB/OStoreDBTest.hpp
index 3dfe6f8a7756f934981109457d985be24e3fc78f..5aa60fe8b6a25221ec4986e150f933af1e9f1620 100644
--- a/scheduler/OStoreDB/OStoreDBTest.hpp
+++ b/scheduler/OStoreDB/OStoreDBTest.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/OStoreDB/OStoreDBWithAgent.cpp b/scheduler/OStoreDB/OStoreDBWithAgent.cpp
index be42c5570fb48c484a961d7215e843a40a0c0b23..f4558de10fa6b7f87b64140e48654a8bb394ca25 100644
--- a/scheduler/OStoreDB/OStoreDBWithAgent.cpp
+++ b/scheduler/OStoreDB/OStoreDBWithAgent.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/OStoreDB/OStoreDBWithAgent.hpp b/scheduler/OStoreDB/OStoreDBWithAgent.hpp
index 3872b434edfc85c6516a68c337d0d079cadfa7ab..087c51337f54d031b8bf9c5d85eceafd985c75ee 100644
--- a/scheduler/OStoreDB/OStoreDBWithAgent.hpp
+++ b/scheduler/OStoreDB/OStoreDBWithAgent.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/OStoreDB/QueueItor.cpp b/scheduler/OStoreDB/QueueItor.cpp
index f4060ea4dd9b6010d93a4869dad29ecc4e93c7c4..c56ad63dbb419896e9ddb969f45de49dd5ae502d 100644
--- a/scheduler/OStoreDB/QueueItor.cpp
+++ b/scheduler/OStoreDB/QueueItor.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/OStoreDB/QueueItor.hpp b/scheduler/OStoreDB/QueueItor.hpp
index 7c7a95feeb61c5f952bb943940da1049977a2044..23e3ef608da59f30de20bc902d1371351e64b0f6 100644
--- a/scheduler/OStoreDB/QueueItor.hpp
+++ b/scheduler/OStoreDB/QueueItor.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/PositioningMethod.cpp b/scheduler/PositioningMethod.cpp
index 46b9d023e0cd79c7ba8135719d851517655648e0..eac059344a331b4ec319b195e9b889d76da7aae3 100644
--- a/scheduler/PositioningMethod.cpp
+++ b/scheduler/PositioningMethod.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/PositioningMethod.hpp b/scheduler/PositioningMethod.hpp
index c4fa6e8dd96c172cc791fad2417c999b183ecc37..9b1f4cf5ccecee9851dd5f9db5c1d9ef1d1eea99 100644
--- a/scheduler/PositioningMethod.hpp
+++ b/scheduler/PositioningMethod.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/RepackReportThread.cpp b/scheduler/RepackReportThread.cpp
index aa3915d1f64b49057bb12f458d743cd1375cd03b..253f9afa3a990b0b5fa5c0b54063231657d606a8 100644
--- a/scheduler/RepackReportThread.cpp
+++ b/scheduler/RepackReportThread.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/RepackReportThread.hpp b/scheduler/RepackReportThread.hpp
index 3669c62912f6dd70940628f26e9c37a324cdb833..5cd667a4d4eeb4332f1bdd200f91421f62a71ad5 100644
--- a/scheduler/RepackReportThread.hpp
+++ b/scheduler/RepackReportThread.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/RepackRequest.cpp b/scheduler/RepackRequest.cpp
index fc8a47eec0a7733fd12c7ebe376f6dab4c2f70a3..1eb6ccb460cca7be655595b2941e9e1d5b9ffd5b 100644
--- a/scheduler/RepackRequest.cpp
+++ b/scheduler/RepackRequest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/RepackRequest.hpp b/scheduler/RepackRequest.hpp
index 80d5baa6a42a8040b299691582ad93bd31a146ed..543e75e7797b0fe2cdfacfb548c8fb76b0f3fdde 100644
--- a/scheduler/RepackRequest.hpp
+++ b/scheduler/RepackRequest.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/RepackRequestManager.cpp b/scheduler/RepackRequestManager.cpp
index 90d0c1dcf4833df2665c1bd727d55c70e44f5f7e..ae66b86e80bdcc9bb110cb2e3535ad7aabfdd49f 100644
--- a/scheduler/RepackRequestManager.cpp
+++ b/scheduler/RepackRequestManager.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/RepackRequestManager.hpp b/scheduler/RepackRequestManager.hpp
index 22666c3b5d4decc127a1d9494b5d5a79b0f75a83..080d25de29a848c66ab74522312c5dec7b42ba9d 100644
--- a/scheduler/RepackRequestManager.hpp
+++ b/scheduler/RepackRequestManager.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/RetrieveJob.cpp b/scheduler/RetrieveJob.cpp
index d4a1733cafd5e2d20428a2e0f91d00c4de046bca..05d0ff52025d3aa8c5a48cb87083214f60dcce80 100644
--- a/scheduler/RetrieveJob.cpp
+++ b/scheduler/RetrieveJob.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/RetrieveJob.hpp b/scheduler/RetrieveJob.hpp
index 16afe478d6a0efa6724b305f947eb8b8a996396c..6512349c950a43d7b2001ab74b9f329c4d9b04be 100644
--- a/scheduler/RetrieveJob.hpp
+++ b/scheduler/RetrieveJob.hpp
@@ -1,6 +1,6 @@
   /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/RetrieveMount.cpp b/scheduler/RetrieveMount.cpp
index 727cf038b48e8e661a2ec10168b38be93cde8a4c..5c89d7a10a48a2b8f1625951a288148a48a4a008 100644
--- a/scheduler/RetrieveMount.cpp
+++ b/scheduler/RetrieveMount.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/RetrieveMount.hpp b/scheduler/RetrieveMount.hpp
index 10c7340093ddb6e40e012098cae3d6b5b0b48c27..2cda084cfc8307c375c271b5929d721f78e8ac40 100644
--- a/scheduler/RetrieveMount.hpp
+++ b/scheduler/RetrieveMount.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/RetrieveRequestDump.hpp b/scheduler/RetrieveRequestDump.hpp
index 78b4743930aabec13b3cc91be35d71f5ed6fc5d6..c060b7e6c2a101c16ba01b0b7a0b7f01d37d8200 100644
--- a/scheduler/RetrieveRequestDump.hpp
+++ b/scheduler/RetrieveRequestDump.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/Scheduler.cpp b/scheduler/Scheduler.cpp
index 44b2cbb9708bf714ea941ac1c6330238eb646be9..91085bf0876616af5b521064c28b74da4db67735 100644
--- a/scheduler/Scheduler.cpp
+++ b/scheduler/Scheduler.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -513,9 +513,7 @@ void Scheduler::expandRepackRequest(std::unique_ptr<RepackRequest>& repackReques
     }
   }
 
-  std::list<common::dataStructures::StorageClass> storageClasses;
-  if(repackInfo.type == RepackType::AddCopiesOnly || repackInfo.type == RepackType::MoveAndAddCopies)
-    storageClasses = m_catalogue.getStorageClasses();
+  std::list<common::dataStructures::StorageClass> storageClasses = m_catalogue.getStorageClasses();
 
   repackRequest->m_dbReq->setExpandStartedAndChangeStatus();
   uint64_t nbRetrieveSubrequestsQueued = 0;
@@ -553,6 +551,22 @@ void Scheduler::expandRepackRequest(std::unique_ptr<RepackRequest>& repackReques
     retrieveSubRequest.archiveFile = archiveFile;
     retrieveSubRequest.fSeq = std::numeric_limits<decltype(retrieveSubRequest.fSeq)>::max();
 
+     //Check that all the archive routes have been configured, if one archive route is missing, we fail the repack request.
+    auto archiveFileRoutes = archiveRoutesMap[archiveFile.storageClass];
+    auto storageClassOfArchiveFile = std::find_if(storageClasses.begin(),storageClasses.end(),[&archiveFile](const common::dataStructures::StorageClass& sc){
+      return sc.name == archiveFile.storageClass;
+    });
+
+    if(storageClassOfArchiveFile == storageClasses.end()) {
+      //No storage class have been found for the current tapefile throw an exception
+      deleteRepackBuffer(std::move(dir),lc);
+      std::ostringstream oss;
+      oss << "In Scheduler::expandRepackRequest(): No storage class have been found for the file to repack. ArchiveFileID=" << archiveFile.archiveFileID << " StorageClass of the file=" << archiveFile.storageClass;
+      throw ExpandRepackRequestException(oss.str());
+    }
+
+    common::dataStructures::StorageClass sc = *storageClassOfArchiveFile;
+
     // We have to determine which copynbs we want to rearchive, and under which fSeq we record this file.
     if (repackInfo.type == RepackType::MoveAndAddCopies || repackInfo.type == RepackType::MoveOnly) {
       // determine which fSeq(s) (normally only one) lives on this tape.
@@ -561,6 +575,17 @@ void Scheduler::expandRepackRequest(std::unique_ptr<RepackRequest>& repackReques
         // If not, we will ensure the subrequest is filed under the lowest fSeq existing on this tape.
         // This will prevent double subrequest creation (we already have such a mechanism in case of crash and
         // restart of expansion.
+
+        //Here, test that the archive route of the copyNb of the tape file is configured
+        try {
+          archiveFileRoutes.at(tc.copyNb);
+        } catch (const std::out_of_range & ex) {
+          deleteRepackBuffer(std::move(dir),lc);
+          std::ostringstream oss;
+          oss << "In Scheduler::expandRepackRequest(): the file archiveFileID=" << archiveFile.archiveFileID << ", copyNb=" << std::to_string(tc.copyNb) << ", storageClass=" << archiveFile.storageClass << " does not have any archive route for archival.";
+          throw ExpandRepackRequestException(oss.str());
+        }
+
         totalStatsFile.totalFilesToArchive += 1;
         totalStatsFile.totalBytesToArchive += retrieveSubRequest.archiveFile.fileSize;
         retrieveSubRequest.copyNbsToRearchive.insert(tc.copyNb);
@@ -571,53 +596,42 @@ void Scheduler::expandRepackRequest(std::unique_ptr<RepackRequest>& repackReques
     if(repackInfo.type == RepackType::AddCopiesOnly || repackInfo.type == RepackType::MoveAndAddCopies){
       //We are in the case where we possibly need to create new copies (if the number of copies the storage class of the current ArchiveFile
       //is greater than the number of tape files we have in the current ArchiveFile)
-      auto archiveFileRoutes = archiveRoutesMap[archiveFile.storageClass];
-      auto storageClassItor = std::find_if(storageClasses.begin(),storageClasses.end(),[&archiveFile](const common::dataStructures::StorageClass& sc){
-        return sc.name == archiveFile.storageClass;
-      });
-      if(storageClassItor != storageClasses.end()){
-        common::dataStructures::StorageClass sc = *storageClassItor;
-        uint64_t nbFilesAlreadyArchived = getNbFilesAlreadyArchived(archiveFile);
-        uint64_t nbCopiesInStorageClass = sc.nbCopies;
-        uint64_t filesToArchive = nbCopiesInStorageClass - nbFilesAlreadyArchived;
-        if(filesToArchive > 0){
-          totalStatsFile.totalFilesToArchive += filesToArchive;
-          totalStatsFile.totalBytesToArchive += (filesToArchive * archiveFile.fileSize);
-          std::set<uint64_t> copyNbsAlreadyInCTA;
-          for (auto & tc: archiveFile.tapeFiles) {
-            copyNbsAlreadyInCTA.insert(tc.copyNb);
-            if (tc.vid == repackInfo.vid) {
-              // We make the (reasonable) assumption that the archive file only has one copy on this tape.
-              // If not, we will ensure the subrequest is filed under the lowest fSeq existing on this tape.
-              // This will prevent double subrequest creation (we already have such a mechanism in case of crash and
-              // restart of expansion.
-              //We found the copy of the file we want to retrieve and archive
-              //retrieveSubRequest.fSeq = tc.fSeq;
-              if(repackInfo.type == RepackType::AddCopiesOnly)
-                retrieveSubRequest.fSeq = (retrieveSubRequest.fSeq == std::numeric_limits<decltype(retrieveSubRequest.fSeq)>::max()) ? tc.fSeq : std::max(tc.fSeq, retrieveSubRequest.fSeq);
-            }
-          }
-          for(auto archiveFileRoutesItor = archiveFileRoutes.begin(); archiveFileRoutesItor != archiveFileRoutes.end(); ++archiveFileRoutesItor){
-            if(copyNbsAlreadyInCTA.find(archiveFileRoutesItor->first) == copyNbsAlreadyInCTA.end()){
-              //We need to archive the missing copy
-              retrieveSubRequest.copyNbsToRearchive.insert(archiveFileRoutesItor->first);
-            }
+      uint64_t nbFilesAlreadyArchived = getNbFilesAlreadyArchived(archiveFile);
+      uint64_t nbCopiesInStorageClass = sc.nbCopies;
+      uint64_t filesToArchive = nbCopiesInStorageClass - nbFilesAlreadyArchived;
+      if(filesToArchive > 0){
+        totalStatsFile.totalFilesToArchive += filesToArchive;
+        totalStatsFile.totalBytesToArchive += (filesToArchive * archiveFile.fileSize);
+        std::set<uint64_t> copyNbsAlreadyInCTA;
+        for (auto & tc: archiveFile.tapeFiles) {
+          copyNbsAlreadyInCTA.insert(tc.copyNb);
+          if (tc.vid == repackInfo.vid) {
+            // We make the (reasonable) assumption that the archive file only has one copy on this tape.
+            // If not, we will ensure the subrequest is filed under the lowest fSeq existing on this tape.
+            // This will prevent double subrequest creation (we already have such a mechanism in case of crash and
+            // restart of expansion.
+            //We found the copy of the file we want to retrieve and archive
+            //retrieveSubRequest.fSeq = tc.fSeq;
+            if(repackInfo.type == RepackType::AddCopiesOnly)
+              retrieveSubRequest.fSeq = (retrieveSubRequest.fSeq == std::numeric_limits<decltype(retrieveSubRequest.fSeq)>::max()) ? tc.fSeq : std::max(tc.fSeq, retrieveSubRequest.fSeq);
           }
-          if(retrieveSubRequest.copyNbsToRearchive.size() < filesToArchive){
-            deleteRepackBuffer(std::move(dir),lc);
-            throw ExpandRepackRequestException("In Scheduler::expandRepackRequest(): Missing archive routes for the creation of the new copies of the files");
-          }
-        } else {
-          if(repackInfo.type == RepackType::AddCopiesOnly){
-            //Nothing to Archive so nothing to Retrieve as well
-            retrieveSubrequests.pop_back();
-            continue;
+        }
+        for(auto archiveFileRoutesItor = archiveFileRoutes.begin(); archiveFileRoutesItor != archiveFileRoutes.end(); ++archiveFileRoutesItor){
+          if(copyNbsAlreadyInCTA.find(archiveFileRoutesItor->first) == copyNbsAlreadyInCTA.end()){
+            //We need to archive the missing copy
+            retrieveSubRequest.copyNbsToRearchive.insert(archiveFileRoutesItor->first);
           }
         }
+        if(retrieveSubRequest.copyNbsToRearchive.size() < filesToArchive){
+          deleteRepackBuffer(std::move(dir),lc);
+          throw ExpandRepackRequestException("In Scheduler::expandRepackRequest(): Missing archive routes for the creation of the new copies of the files");
+        }
       } else {
-        //No storage class have been found for the current tapefile throw an exception
-        deleteRepackBuffer(std::move(dir),lc);
-        throw ExpandRepackRequestException("In Scheduler::expandRepackRequest(): No storage class have been found for the file to add copies");
+        if(repackInfo.type == RepackType::AddCopiesOnly){
+          //Nothing to Archive so nothing to Retrieve as well
+          retrieveSubrequests.pop_back();
+          continue;
+        }
       }
     }
 
diff --git a/scheduler/Scheduler.hpp b/scheduler/Scheduler.hpp
index ea68331db3a2538b73f18b137d40338b892a8b40..c29639d46d84a0a1715c0762e8f3d9abbfbc29fd 100644
--- a/scheduler/Scheduler.hpp
+++ b/scheduler/Scheduler.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/SchedulerDatabase.cpp b/scheduler/SchedulerDatabase.cpp
index d47ab33adbc255e7de9a9550760cd637f0aa65de..fe1bd30d4ef997be9654e0ab0f02e3228adb6202 100644
--- a/scheduler/SchedulerDatabase.cpp
+++ b/scheduler/SchedulerDatabase.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/SchedulerDatabase.hpp b/scheduler/SchedulerDatabase.hpp
index 9e70c5c97aae5b363aab0cecfd83175a47dec73d..ed93bb03b3ffb12c3d74f9af7e1e349df7dc4155 100644
--- a/scheduler/SchedulerDatabase.hpp
+++ b/scheduler/SchedulerDatabase.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/SchedulerDatabaseFactory.cpp b/scheduler/SchedulerDatabaseFactory.cpp
index 17f25cec0ce0cdf52bac930384e429a633229054..a5f443e498ad60f5689e7c940cb33e29ba7438fa 100644
--- a/scheduler/SchedulerDatabaseFactory.cpp
+++ b/scheduler/SchedulerDatabaseFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/SchedulerDatabaseFactory.hpp b/scheduler/SchedulerDatabaseFactory.hpp
index 466b7dbe87534c9d0f63f8d006aedc5a7707db60..bb69f6b068b9ad7197fa1a871184bbe2dea4a677 100644
--- a/scheduler/SchedulerDatabaseFactory.hpp
+++ b/scheduler/SchedulerDatabaseFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/SchedulerDatabaseTest.cpp b/scheduler/SchedulerDatabaseTest.cpp
index 74f6d3fe0010f5f4e2421612f7fd0b4c60648904..feb81c0f369c6e978084c66a2cf02c58fc071d18 100644
--- a/scheduler/SchedulerDatabaseTest.cpp
+++ b/scheduler/SchedulerDatabaseTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/SchedulerTest.cpp b/scheduler/SchedulerTest.cpp
index f5fa0c943f8541cd2c7ba83f11a30610132449db..f03b0190de4ceb6e8d6646deb61d4beadb4229ea 100644
--- a/scheduler/SchedulerTest.cpp
+++ b/scheduler/SchedulerTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -3960,6 +3960,184 @@ TEST_P(SchedulerTest, expandRepackRequestAddCopiesOnly) {
   }
 }
 
+TEST_P(SchedulerTest, expandRepackRequestShouldFailIfArchiveRouteMissing) {
+  using namespace cta;
+  using namespace cta::objectstore;
+  unitTests::TempDirectory tempDirectory;
+  auto &catalogue = getCatalogue();
+  auto &scheduler = getScheduler();
+  auto &schedulerDB = getSchedulerDB();
+  cta::objectstore::Backend& backend = schedulerDB.getBackend();
+  setupDefaultCatalogue();
+#ifdef STDOUT_LOGGING
+  log::StdoutLogger dl("dummy", "unitTest");
+#else
+  log::DummyLogger dl("", "");
+#endif
+  log::LogContext lc(dl);
+  
+  //Create an agent to represent this test process
+  cta::objectstore::AgentReference agentReference("expandRepackRequestTest", dl);
+  cta::objectstore::Agent agent(agentReference.getAgentAddress(), backend);
+  agent.initialize();
+  agent.setTimeout_us(0);
+  agent.insertAndRegisterSelf(lc);
+  
+  cta::common::dataStructures::SecurityIdentity admin;
+  admin.username = "admin_user_name";
+  admin.host = "admin_host";
+  
+  //Create a logical library in the catalogue
+  const bool logicalLibraryIsDisabled = false;
+  catalogue.createLogicalLibrary(admin, s_libraryName, logicalLibraryIsDisabled, "Create logical library");
+  
+  //Create the source tape
+  std::string vidCopyNb1 = "vidSource";
+  {
+    auto tape = getDefaultTape();
+    tape.vid = vidCopyNb1;
+    tape.full = true;
+    catalogue.createTape(s_adminOnAdminHost, tape);
+  }
+  
+  //Create two different destination tapepool
+  std::string tapepool2Name = "tapepool2";
+  const cta::optional<std::string> supply;
+  catalogue.createTapePool(admin,tapepool2Name,"vo",1,false,supply,"comment");
+  
+  //Create a storage class in the catalogue
+  common::dataStructures::StorageClass storageClass;
+  storageClass.name = s_storageClassName;
+  storageClass.nbCopies = 2;
+  storageClass.comment = "Create storage class";
+  catalogue.modifyStorageClassNbCopies(admin,storageClass.name,storageClass.nbCopies);
+  
+  //Create the one archive route for the second copy
+  catalogue.createArchiveRoute(admin,storageClass.name,2,tapepool2Name,"ArchiveRoute3");
+  
+  //Create two other destinationTape
+  std::string vidCopyNb2_source = "vidCopyNb2-source";
+  {
+    auto tape = getDefaultTape();
+    tape.vid = vidCopyNb2_source;
+    tape.tapePoolName = tapepool2Name;
+    catalogue.createTape(s_adminOnAdminHost, tape);
+  }
+  
+  std::string vidCopyNb2_destination = "vidCopyNb2-destination";
+  {
+    auto tape = getDefaultTape();
+    tape.vid = vidCopyNb2_destination;
+    tape.tapePoolName = tapepool2Name;
+    catalogue.createTape(s_adminOnAdminHost, tape);
+  }
+
+  const std::string tapeDrive = "tape_drive";
+  const uint64_t nbArchiveFilesPerTape = 10;
+  const uint64_t archiveFileSize = 2 * 1000 * 1000 * 1000;
+  
+  //Simulate the writing of 10 files the source tape in the catalogue
+  std::set<catalogue::TapeItemWrittenPointer> tapeFilesWrittenCopy;
+  {
+    uint64_t archiveFileId = 1;
+    std::string currentVid = vidCopyNb1;
+    for(uint64_t j = 1; j <= nbArchiveFilesPerTape; ++j) {
+      std::ostringstream diskFileId;
+      diskFileId << (12345677 + archiveFileId);
+      std::ostringstream diskFilePath;
+      diskFilePath << "/public_dir/public_file_"<<1<<"_"<< j;
+      auto fileWrittenUP=cta::make_unique<cta::catalogue::TapeFileWritten>();
+      auto & fileWritten = *fileWrittenUP;
+      fileWritten.archiveFileId = archiveFileId++;
+      fileWritten.diskInstance = s_diskInstance;
+      fileWritten.diskFileId = diskFileId.str();
+      
+      fileWritten.diskFileOwnerUid = PUBLIC_OWNER_UID;
+      fileWritten.diskFileGid = PUBLIC_GID;
+      fileWritten.size = archiveFileSize;
+      fileWritten.checksumBlob.insert(cta::checksum::ADLER32,"1234");
+      fileWritten.storageClassName = s_storageClassName;
+      fileWritten.vid = currentVid;
+      fileWritten.fSeq = j;
+      fileWritten.blockId = j * 100;
+      fileWritten.size = archiveFileSize;
+      fileWritten.copyNb = 1;
+      fileWritten.tapeDrive = tapeDrive;
+      tapeFilesWrittenCopy.emplace(fileWrittenUP.release());
+    }
+    //update the DB tape
+    catalogue.filesWrittenToTape(tapeFilesWrittenCopy);
+    tapeFilesWrittenCopy.clear();
+  }
+  //Archive the second copy of the files in the tape located in the tapepool2
+  {
+    uint64_t archiveFileId = 1;
+    std::string currentVid = vidCopyNb2_source;
+    for(uint64_t j = 1; j <= nbArchiveFilesPerTape; ++j) {
+      std::ostringstream diskFileId;
+      diskFileId << (12345677 + archiveFileId);
+      std::ostringstream diskFilePath;
+      diskFilePath << "/public_dir/public_file_"<<1<<"_"<< j;
+      auto fileWrittenUP=cta::make_unique<cta::catalogue::TapeFileWritten>();
+      auto & fileWritten = *fileWrittenUP;
+      fileWritten.archiveFileId = archiveFileId++;
+      fileWritten.diskInstance = s_diskInstance;
+      fileWritten.diskFileId = diskFileId.str();
+      
+      fileWritten.diskFileOwnerUid = PUBLIC_OWNER_UID;
+      fileWritten.diskFileGid = PUBLIC_GID;
+      fileWritten.size = archiveFileSize;
+      fileWritten.checksumBlob.insert(cta::checksum::ADLER32,"1234");
+      fileWritten.storageClassName = s_storageClassName;
+      fileWritten.vid = currentVid;
+      fileWritten.fSeq = j;
+      fileWritten.blockId = j * 100;
+      fileWritten.size = archiveFileSize;
+      fileWritten.copyNb = 2;
+      fileWritten.tapeDrive = tapeDrive;
+      tapeFilesWrittenCopy.emplace(fileWrittenUP.release());
+    }
+    //update the DB tape
+    catalogue.filesWrittenToTape(tapeFilesWrittenCopy);
+    tapeFilesWrittenCopy.clear();
+  }
+  catalogue.setTapeFull(admin,vidCopyNb2_source,true);
+  //Delete the archive route of the second copy and repack the tape that contains these second copies
+  catalogue.deleteArchiveRoute(storageClass.name,2);
+  {
+    std::string vid = vidCopyNb2_source;
+    cta::SchedulerDatabase::QueueRepackRequest qrr(vid,"file://"+tempDirectory.path(),common::dataStructures::RepackInfo::Type::MoveAndAddCopies,
+    common::dataStructures::MountPolicy::s_defaultMountPolicyForRepack,s_defaultRepackDisabledTapeFlag,s_defaultRepackNoRecall);
+    scheduler.queueRepack(admin,qrr,lc);
+    scheduler.waitSchedulerDbSubthreadsComplete();
+    
+    //Get the address of the Repack Request
+    cta::objectstore::RootEntry re(backend);
+    re.fetchNoLock();
+    
+    std::string repackQueueAddress = re.getRepackQueueAddress(common::dataStructures::RepackQueueType::Pending);
+    
+    cta::objectstore::RepackQueuePending repackQueuePending(repackQueueAddress,backend);
+    repackQueuePending.fetchNoLock();
+    
+    std::string repackRequestAddress = repackQueuePending.getCandidateList(1,{}).candidates.front().address;
+
+    log::TimingList tl;
+    utils::Timer t;
+
+    scheduler.promoteRepackRequestsToToExpand(lc);
+    scheduler.waitSchedulerDbSubthreadsComplete();
+
+    auto repackRequestToExpand = scheduler.getNextRepackRequestToExpand();
+    scheduler.waitSchedulerDbSubthreadsComplete();
+    
+    ASSERT_EQ(vid,repackRequestToExpand->getRepackInfo().vid);
+    
+    //Expansion should fail.
+    ASSERT_THROW(scheduler.expandRepackRequest(repackRequestToExpand,tl,t,lc),cta::ExpandRepackRequestException);
+  }
+}
+
 TEST_P(SchedulerTest, expandRepackRequestMoveAndAddCopies){
   using namespace cta;
   using namespace cta::objectstore;
diff --git a/scheduler/SchedulingInfos.cpp b/scheduler/SchedulingInfos.cpp
index e8f59b2063d0050bbbf5d7ddd09ee7dd0c932348..adb9829f7d4f72cc20e02b2416b839ee25288ced 100644
--- a/scheduler/SchedulingInfos.cpp
+++ b/scheduler/SchedulingInfos.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/SchedulingInfos.hpp b/scheduler/SchedulingInfos.hpp
index ae005544bcf67128a35d509b68b11214a3ed1d57..34020bcdfa28bfd9675bf7d1c65afd1360300074 100644
--- a/scheduler/SchedulingInfos.hpp
+++ b/scheduler/SchedulingInfos.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/TapeMount.cpp b/scheduler/TapeMount.cpp
index 6c94383fb7d48901d5c2765a5b33f562405e750a..870b0082de76a6e1879c57e91d165e4fdec45936 100644
--- a/scheduler/TapeMount.cpp
+++ b/scheduler/TapeMount.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/TapeMount.hpp b/scheduler/TapeMount.hpp
index 9394a7b0308b19b71313a1430e9c8b7be24e50b3..8073b4126a622c1f55fe3f8e16e40f2bb98428f4 100644
--- a/scheduler/TapeMount.hpp
+++ b/scheduler/TapeMount.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/TapeMountDummy.hpp b/scheduler/TapeMountDummy.hpp
index 5a9593ea93886866f99d51c6212b0d9ad655ea56..de7ccbfac6550f209fa65471c86180b062959e53 100644
--- a/scheduler/TapeMountDummy.hpp
+++ b/scheduler/TapeMountDummy.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/testingMocks/MockArchiveJob.hpp b/scheduler/testingMocks/MockArchiveJob.hpp
index 5bb17d61dce73f25699e22c77cc6057bb38db56a..6c3b24943c3652a6141f989016078dc123b00f55 100644
--- a/scheduler/testingMocks/MockArchiveJob.hpp
+++ b/scheduler/testingMocks/MockArchiveJob.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/testingMocks/MockArchiveMount.hpp b/scheduler/testingMocks/MockArchiveMount.hpp
index 3ec26ccf08a1854adb6641354e061e5adf833c18..57500d210a7bd0c4daf4985584598dd2128c211d 100644
--- a/scheduler/testingMocks/MockArchiveMount.hpp
+++ b/scheduler/testingMocks/MockArchiveMount.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/testingMocks/MockRetrieveJob.hpp b/scheduler/testingMocks/MockRetrieveJob.hpp
index 09569c1dbd77ebdd3f0f4382e4c033fe0f9d2e36..28165033b8c07943f38c2104cf7e9e7842533391 100644
--- a/scheduler/testingMocks/MockRetrieveJob.hpp
+++ b/scheduler/testingMocks/MockRetrieveJob.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/scheduler/testingMocks/MockRetrieveMount.hpp b/scheduler/testingMocks/MockRetrieveMount.hpp
index ee7d37d22d78099296b9f3ec5b01c00cb2c507e7..86125e5723606996f6a3acbfa4d79ec3668a2bb7 100644
--- a/scheduler/testingMocks/MockRetrieveMount.hpp
+++ b/scheduler/testingMocks/MockRetrieveMount.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/DatabaseStatisticsService.cpp b/statistics/DatabaseStatisticsService.cpp
index 4b150a665f724c71635ab104b925999d8c234f67..f935a27af786dcee8d77bab1a4d61132bfdc219d 100644
--- a/statistics/DatabaseStatisticsService.cpp
+++ b/statistics/DatabaseStatisticsService.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/DatabaseStatisticsService.hpp b/statistics/DatabaseStatisticsService.hpp
index 33d6e6c15e8c8399600a6095576835ca066ace0a..b02f4f370ccf95e37aab5e7e708f2a39805eb8e7 100644
--- a/statistics/DatabaseStatisticsService.hpp
+++ b/statistics/DatabaseStatisticsService.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/DatabaseStatisticsServiceFactory.cpp b/statistics/DatabaseStatisticsServiceFactory.cpp
index 8c64742c647fd939f12ba3dcae58ac059be3d091..0142b6d19053d072219fbe0a45f72fca9812f3c7 100644
--- a/statistics/DatabaseStatisticsServiceFactory.cpp
+++ b/statistics/DatabaseStatisticsServiceFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/DatabaseStatisticsServiceFactory.hpp b/statistics/DatabaseStatisticsServiceFactory.hpp
index 54ecf7eebf3b187a7cca566e4366e517a5a9be80..43ec67f33a250831450726f8776feced84af5d84 100644
--- a/statistics/DatabaseStatisticsServiceFactory.hpp
+++ b/statistics/DatabaseStatisticsServiceFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/FileStatistics.cpp b/statistics/FileStatistics.cpp
index a8fed4cbf9f0ea8b38ce009f827bf7f08c4428c9..e2876bdef7adfe30460185ec63d868f6f782fd5b 100644
--- a/statistics/FileStatistics.cpp
+++ b/statistics/FileStatistics.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/FileStatistics.hpp b/statistics/FileStatistics.hpp
index 218d33974a0d771125ceb2d7d966771cf81ecd58..f92b3c20627588be530649ea7e6fe8c68d5f1eef 100644
--- a/statistics/FileStatistics.hpp
+++ b/statistics/FileStatistics.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/JsonStatisticsService.cpp b/statistics/JsonStatisticsService.cpp
index 65871aa6e8d86022cb325d3c7b6a18df224827e7..355badd3cce123646c941f7d1b912ebe46343a1b 100644
--- a/statistics/JsonStatisticsService.cpp
+++ b/statistics/JsonStatisticsService.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/JsonStatisticsService.hpp b/statistics/JsonStatisticsService.hpp
index 8014340e0ce7c86442d6263d12c1330716247f41..9e13f7e20cb18c8aa7d2837dc2c02ce97c385062 100644
--- a/statistics/JsonStatisticsService.hpp
+++ b/statistics/JsonStatisticsService.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/JsonStatisticsServiceFactory.hpp b/statistics/JsonStatisticsServiceFactory.hpp
index 6bae750286aac2f8eeca5c4d09681fd61b11f46b..62f85bc22d5d2b2de93024e46a0b8c84c8a6d7c4 100644
--- a/statistics/JsonStatisticsServiceFactory.hpp
+++ b/statistics/JsonStatisticsServiceFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/MySQLStatisticsService.cpp b/statistics/MySQLStatisticsService.cpp
index a1e593654be935935d204d7240f13b9a6ecb6933..81a1ee9e0a4b302942db5c9e147f13c304629648 100644
--- a/statistics/MySQLStatisticsService.cpp
+++ b/statistics/MySQLStatisticsService.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/MySQLStatisticsService.hpp b/statistics/MySQLStatisticsService.hpp
index 00209903363bf202c0db1ab6dcd80b7fa8c3455c..ffcfed2c71de3b78c0bae687f79a13bdf7a87aed 100644
--- a/statistics/MySQLStatisticsService.hpp
+++ b/statistics/MySQLStatisticsService.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/MysqlStatisticsSchema.before_SQL.cpp b/statistics/MysqlStatisticsSchema.before_SQL.cpp
index 1bae4f37950f34a672e4ad6c3873e126aed5d5a6..ecb95405ea4d1b0b78e2782c8c74d9e42e5f8e00 100644
--- a/statistics/MysqlStatisticsSchema.before_SQL.cpp
+++ b/statistics/MysqlStatisticsSchema.before_SQL.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/MysqlStatisticsSchema.hpp b/statistics/MysqlStatisticsSchema.hpp
index 6c84a1d1b5b6109b11e898ddfd71be5ec477bf1d..8040a63b9214ba03d4a7526f5e1d866d01953f2d 100644
--- a/statistics/MysqlStatisticsSchema.hpp
+++ b/statistics/MysqlStatisticsSchema.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/Statistics.cpp b/statistics/Statistics.cpp
index c420098c7b8c3eb76e712e0dbaf19cd294edf0ef..7a7b1d255eaaa6242fa7d6bcad21c52a32e2cb61 100644
--- a/statistics/Statistics.cpp
+++ b/statistics/Statistics.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/Statistics.hpp b/statistics/Statistics.hpp
index 261ee8e84941d06e28b7a223696c3f7e4916d3af..f043a492ebcd65d1404bc623927c35ebd3988e0f 100644
--- a/statistics/Statistics.hpp
+++ b/statistics/Statistics.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/StatisticsSaveCmd.cpp b/statistics/StatisticsSaveCmd.cpp
index 287bcf39b74e6109270608f864cba610ec966288..19a570fe800c436c62e63547e138e6bbfe9ffea6 100644
--- a/statistics/StatisticsSaveCmd.cpp
+++ b/statistics/StatisticsSaveCmd.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/StatisticsSaveCmd.hpp b/statistics/StatisticsSaveCmd.hpp
index 3fe661b15df206ad7d41eb973e631bd1f17930db..2f68ce0ba229ce0f5ac0b66b106ac644c2f79b46 100644
--- a/statistics/StatisticsSaveCmd.hpp
+++ b/statistics/StatisticsSaveCmd.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/StatisticsSaveCmdLineArgs.cpp b/statistics/StatisticsSaveCmdLineArgs.cpp
index e72e020e23b64281a2aa4beb225227a2f80c6778..c03a1c47c06f67bfdfe5ee3525c0a4ed33bca50a 100644
--- a/statistics/StatisticsSaveCmdLineArgs.cpp
+++ b/statistics/StatisticsSaveCmdLineArgs.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/StatisticsSaveCmdLineArgs.hpp b/statistics/StatisticsSaveCmdLineArgs.hpp
index ca5079616ef7340a10365e5b2c836d73d08877e1..3da0936784e0055c6b2534da35bccfa8a02cb893 100644
--- a/statistics/StatisticsSaveCmdLineArgs.hpp
+++ b/statistics/StatisticsSaveCmdLineArgs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/StatisticsSaveCmdMain.cpp b/statistics/StatisticsSaveCmdMain.cpp
index f012af8a538ab97151079f095e4238ffb89c4c82..51f2aaa9389285e9994bb00312cb88913fa3bc27 100644
--- a/statistics/StatisticsSaveCmdMain.cpp
+++ b/statistics/StatisticsSaveCmdMain.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/StatisticsSchema.cpp b/statistics/StatisticsSchema.cpp
index 7a3cc8b69b3123a4b0da8417a2a3f869d4da8900..7f01ba681ce3b8d51e218893189e9d7eb8b1e728 100644
--- a/statistics/StatisticsSchema.cpp
+++ b/statistics/StatisticsSchema.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/StatisticsSchema.hpp b/statistics/StatisticsSchema.hpp
index 938151c5e4c9b90b3aa1082ad6d8afa6ff6171c2..8382f869ddafedd79f9d339d753a22d6c1247863 100644
--- a/statistics/StatisticsSchema.hpp
+++ b/statistics/StatisticsSchema.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/StatisticsSchemaFactory.cpp b/statistics/StatisticsSchemaFactory.cpp
index 5e1be544f6ca70eead2292b4bba7ff00a7bf5a6e..2b60e210c62878e5b63682962cb4de75781d5bfb 100644
--- a/statistics/StatisticsSchemaFactory.cpp
+++ b/statistics/StatisticsSchemaFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/StatisticsSchemaFactory.hpp b/statistics/StatisticsSchemaFactory.hpp
index bfef878c2ec04c340ab46eea8b4094d59a3f4b56..f1172df93c14bbaaf352c6dee1066fa74cb0182f 100644
--- a/statistics/StatisticsSchemaFactory.hpp
+++ b/statistics/StatisticsSchemaFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/StatisticsService.cpp b/statistics/StatisticsService.cpp
index cf1d3baa81be592914841b40f325b20fa6324757..56299145fc9d856b2843381d53ef6de312a1f53b 100644
--- a/statistics/StatisticsService.cpp
+++ b/statistics/StatisticsService.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/StatisticsService.hpp b/statistics/StatisticsService.hpp
index 3740bf592c4ec03da4ff50f265eba9594986eee1..cfcc26796176ab6a33b1debfe7c4ae545199a207 100644
--- a/statistics/StatisticsService.hpp
+++ b/statistics/StatisticsService.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/StatisticsServiceFactory.cpp b/statistics/StatisticsServiceFactory.cpp
index 5f6adc4deea65712b14a436d326ea1a33f8815d8..f8beac6e1074b6299d00169daee6c65b18326570 100644
--- a/statistics/StatisticsServiceFactory.cpp
+++ b/statistics/StatisticsServiceFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/StatisticsServiceFactory.hpp b/statistics/StatisticsServiceFactory.hpp
index 18c69fee7728f52f2ad77754e24c870de928d177..d4781b047031a5edce6606cc563293367477b3a8 100644
--- a/statistics/StatisticsServiceFactory.hpp
+++ b/statistics/StatisticsServiceFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/StatisticsUpdateCmd.cpp b/statistics/StatisticsUpdateCmd.cpp
index b82cb12fa275515fc87207b666d6c5a97f85eba4..1fd07321e005b649f256af6dbc865e29dda36fb7 100644
--- a/statistics/StatisticsUpdateCmd.cpp
+++ b/statistics/StatisticsUpdateCmd.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/StatisticsUpdateCmd.hpp b/statistics/StatisticsUpdateCmd.hpp
index 32df8401ff6a18f27df41ef611ba69e852d347ca..be3c75732d6ede8733b0bd496a91f4fa02384b46 100644
--- a/statistics/StatisticsUpdateCmd.hpp
+++ b/statistics/StatisticsUpdateCmd.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/StatisticsUpdateCmdLineArgs.cpp b/statistics/StatisticsUpdateCmdLineArgs.cpp
index a6e5b42fbbc3183e4aed4fde536fdc6776ff6e02..2b26c479b96617e4ddb3d4b8fb22c363aac91f0e 100644
--- a/statistics/StatisticsUpdateCmdLineArgs.cpp
+++ b/statistics/StatisticsUpdateCmdLineArgs.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/StatisticsUpdateCmdLineArgs.hpp b/statistics/StatisticsUpdateCmdLineArgs.hpp
index 899738efc181cbd43d3b26803b0b7ac393b22aa9..8c6c9c57de39d771d4c9b75da74940fa478c5f6c 100644
--- a/statistics/StatisticsUpdateCmdLineArgs.hpp
+++ b/statistics/StatisticsUpdateCmdLineArgs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/statistics/StatisticsUpdateCmdMain.cpp b/statistics/StatisticsUpdateCmdMain.cpp
index dca9bdf629d9eb1231cc47aeb22d8cdfa6256fa9..cce749440e0af0c154301a4b26f31fb7d13e234e 100644
--- a/statistics/StatisticsUpdateCmdMain.cpp
+++ b/statistics/StatisticsUpdateCmdMain.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/legacymsg/CMakeLists.txt b/tapeserver/castor/legacymsg/CMakeLists.txt
index 08daaf67d8912fb79bc9e67fb64b5e21bc12cb2d..e4cbfee271eedad70c5c573ac1a2f225f920d6cc 100644
--- a/tapeserver/castor/legacymsg/CMakeLists.txt
+++ b/tapeserver/castor/legacymsg/CMakeLists.txt
@@ -1,5 +1,5 @@
 # @project        The CERN Tape Archive (CTA)
-# @copyright      Copyright(C) 2015-2021 CERN
+# @copyright      Copyright(C) 2003-2021 CERN
 # @license        This program is free software: you can redistribute it and/or modify
 #                 it under the terms of the GNU General Public License as published by
 #                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/legacymsg/TapeConstants.h b/tapeserver/castor/legacymsg/TapeConstants.h
index 16e6f5c869933b845954303827b3761cb33708a6..22b976f0584482330413461af90ed63d1e2de5f3 100644
--- a/tapeserver/castor/legacymsg/TapeConstants.h
+++ b/tapeserver/castor/legacymsg/TapeConstants.h
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/legacymsg/TapeLabelRqstMsgBody.cpp b/tapeserver/castor/legacymsg/TapeLabelRqstMsgBody.cpp
index 349374244c1d5ea33305ed264060c32ff46679b5..c84fcf1bde11c025283a512939fd510dc2b6a2b1 100644
--- a/tapeserver/castor/legacymsg/TapeLabelRqstMsgBody.cpp
+++ b/tapeserver/castor/legacymsg/TapeLabelRqstMsgBody.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/legacymsg/TapeLabelRqstMsgBody.hpp b/tapeserver/castor/legacymsg/TapeLabelRqstMsgBody.hpp
index 48bbe1998f60bb2f87fe8a6e22c416a9e6fa6b5f..fa3deeb1ec5c675559cde78f6b67562a892f6d0f 100644
--- a/tapeserver/castor/legacymsg/TapeLabelRqstMsgBody.hpp
+++ b/tapeserver/castor/legacymsg/TapeLabelRqstMsgBody.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/messages/Constants.cpp b/tapeserver/castor/messages/Constants.cpp
index 2da6cbb341aa7efb2234b5cba57cc96428b1f028..68227b07f51493bb8e275679d943e19ce665a78a 100644
--- a/tapeserver/castor/messages/Constants.cpp
+++ b/tapeserver/castor/messages/Constants.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/messages/Constants.hpp b/tapeserver/castor/messages/Constants.hpp
index 3e4828364d1026d205a0e67df16d7b8da259ef1f..9db7730f6895a26b6a50c71d5ab95b32c9b7a711 100644
--- a/tapeserver/castor/messages/Constants.hpp
+++ b/tapeserver/castor/messages/Constants.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/messages/Frame.cpp b/tapeserver/castor/messages/Frame.cpp
index 0aa2cd3c73f9de24a131920161d927ea22cea01e..25ef3e0141f14207714c387e03589851c4a4108e 100644
--- a/tapeserver/castor/messages/Frame.cpp
+++ b/tapeserver/castor/messages/Frame.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/messages/Frame.hpp b/tapeserver/castor/messages/Frame.hpp
index 670ea6f61b7166b3f54a895b06a7eee24d6600e8..e9c5db086d680825dba964e05dee1c0351da3a31 100644
--- a/tapeserver/castor/messages/Frame.hpp
+++ b/tapeserver/castor/messages/Frame.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/messages/README b/tapeserver/castor/messages/README
index e43b56d4814085ca6a053b4a1f46c3524bfb15a1..aa3a7d6422627dc94bed30dc3e94ccf4d642c626 100644
--- a/tapeserver/castor/messages/README
+++ b/tapeserver/castor/messages/README
@@ -1,6 +1,6 @@
 /******************************************************************************
 * @project        The CERN Tape Archive (CTA)
-* @copyright      Copyright(C) 2021 CERN
+* @copyright      Copyright(C) 2003-2021 CERN
 * @license        This program is free software: you can redistribute it and/or modify
 *                 it under the terms of the GNU General Public License as published by
 *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/messages/TapeserverProxyDummy.cpp b/tapeserver/castor/messages/TapeserverProxyDummy.cpp
index bb473cc264e1c6870d6015670a8ed53b1672565c..5680aed79d6bb932b384ab10873bb2bd0752f401 100644
--- a/tapeserver/castor/messages/TapeserverProxyDummy.cpp
+++ b/tapeserver/castor/messages/TapeserverProxyDummy.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/messages/TapeserverProxyDummy.hpp b/tapeserver/castor/messages/TapeserverProxyDummy.hpp
index 29d64ef8e39616ac2e6fc3f1c6d40d87401bd045..7da4260403f11bd44fcbd9d78543e1e1c6d27ebd 100644
--- a/tapeserver/castor/messages/TapeserverProxyDummy.hpp
+++ b/tapeserver/castor/messages/TapeserverProxyDummy.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/messages/messages.cpp b/tapeserver/castor/messages/messages.cpp
index b70c213581392c26b6091e18fa30dbef27ed7039..1a756839945bb0021a2397653a32f99efcccf2f4 100644
--- a/tapeserver/castor/messages/messages.cpp
+++ b/tapeserver/castor/messages/messages.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/messages/messages.hpp b/tapeserver/castor/messages/messages.hpp
index 13f8980dff46656ab327181207ffc54b7e6af300..4e979df21d1ec0e6ff8c6c1e11ec27c5318f9589 100644
--- a/tapeserver/castor/messages/messages.hpp
+++ b/tapeserver/castor/messages/messages.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/Constants.hpp b/tapeserver/castor/tape/Constants.hpp
index 354e68dff7505b0aee7a2bcb40aab999288734c1..fef0a363924c41760540279d5b661ee258476e25 100644
--- a/tapeserver/castor/tape/Constants.hpp
+++ b/tapeserver/castor/tape/Constants.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/CTACostHeuristic.cpp b/tapeserver/castor/tape/tapeserver/RAO/CTACostHeuristic.cpp
index dbd8352e727fa87a5b129570532913ba295fc7da..931fe77d2a29e070e12bdaf51b99a4d8537c6b2a 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/CTACostHeuristic.cpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/CTACostHeuristic.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/CTACostHeuristic.hpp b/tapeserver/castor/tape/tapeserver/RAO/CTACostHeuristic.hpp
index a68669f6da3d2f32140ad826bf1772869aed42dd..e602c2993f08aaef0b14ca8f2bc8d5598b9e6a38 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/CTACostHeuristic.hpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/CTACostHeuristic.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/ConfigurableRAOAlgorithmFactory.cpp b/tapeserver/castor/tape/tapeserver/RAO/ConfigurableRAOAlgorithmFactory.cpp
index bee927dcfea13e17bf15bd0cec23b2cd5b0145f1..9e89a8ca5636c623dcd70f25b0f432aacf3d1e27 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/ConfigurableRAOAlgorithmFactory.cpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/ConfigurableRAOAlgorithmFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/ConfigurableRAOAlgorithmFactory.hpp b/tapeserver/castor/tape/tapeserver/RAO/ConfigurableRAOAlgorithmFactory.hpp
index df478f2c50ad529218836f22e61d6ae34923423b..e31fc7f7901dd96a4bced472e2fa2e3f0ba69b85 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/ConfigurableRAOAlgorithmFactory.hpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/ConfigurableRAOAlgorithmFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/CostHeuristic.cpp b/tapeserver/castor/tape/tapeserver/RAO/CostHeuristic.cpp
index 9459c685d8c3c199b7d1519c22913cc860db9cad..789c395c167a0b751604c5ea596c7de16ee5a380 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/CostHeuristic.cpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/CostHeuristic.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/CostHeuristic.hpp b/tapeserver/castor/tape/tapeserver/RAO/CostHeuristic.hpp
index 3ed88cad7d191df031014579270d193a7a4423a0..7a0643734d6162f4e74d69c8215ae8158a45fa80 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/CostHeuristic.hpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/CostHeuristic.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/CostHeuristicFactory.cpp b/tapeserver/castor/tape/tapeserver/RAO/CostHeuristicFactory.cpp
index 3454af9c68007da3a6b5e10b06ec57207a7b1e53..09d4d925cf901b8338b480f5441d64c46613052a 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/CostHeuristicFactory.cpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/CostHeuristicFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/CostHeuristicFactory.hpp b/tapeserver/castor/tape/tapeserver/RAO/CostHeuristicFactory.hpp
index 7f022357f01da2a4eeef09238dfda88da4c73876..8a87fab7eb54097606bbd4272bf4a25ee34ea47d 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/CostHeuristicFactory.hpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/CostHeuristicFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/EnterpriseRAOAlgorithm.cpp b/tapeserver/castor/tape/tapeserver/RAO/EnterpriseRAOAlgorithm.cpp
index 2c22ae4fb921923fec3eb8263984d47e3070aa6f..b8281c6e384315283c6dba40a93943d0dd962567 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/EnterpriseRAOAlgorithm.cpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/EnterpriseRAOAlgorithm.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/EnterpriseRAOAlgorithm.hpp b/tapeserver/castor/tape/tapeserver/RAO/EnterpriseRAOAlgorithm.hpp
index 14693745f1dff38d73444bc525adb01c05bc98fd..23b296e266c71d8570a25eb30c1448ed36c6bc0c 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/EnterpriseRAOAlgorithm.hpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/EnterpriseRAOAlgorithm.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/EnterpriseRAOAlgorithmFactory.cpp b/tapeserver/castor/tape/tapeserver/RAO/EnterpriseRAOAlgorithmFactory.cpp
index 37d8424880e75088ef64c6a11142942430d291f5..a659145d27855edf94d1261fde641c5c3c98834a 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/EnterpriseRAOAlgorithmFactory.cpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/EnterpriseRAOAlgorithmFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/EnterpriseRAOAlgorithmFactory.hpp b/tapeserver/castor/tape/tapeserver/RAO/EnterpriseRAOAlgorithmFactory.hpp
index da58fd8fe0833cc2346c6a07c2fac6ecd82d878c..9f0a7274ba92bcaff9ea6fb484ff8be18e6e5af5 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/EnterpriseRAOAlgorithmFactory.hpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/EnterpriseRAOAlgorithmFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/FilePositionEstimator.cpp b/tapeserver/castor/tape/tapeserver/RAO/FilePositionEstimator.cpp
index 330c8d6775d8c2c3373ed258762bc652160384e6..3938cdae7b5d687b9249cc173c3ea92550ac6f98 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/FilePositionEstimator.cpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/FilePositionEstimator.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/FilePositionEstimator.hpp b/tapeserver/castor/tape/tapeserver/RAO/FilePositionEstimator.hpp
index cc61f62fdfabe2d1af1558f44d3573adca00387a..b98359591de507561f64a5aacac5433d23303bdc 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/FilePositionEstimator.hpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/FilePositionEstimator.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/FilePositionEstimatorFactory.cpp b/tapeserver/castor/tape/tapeserver/RAO/FilePositionEstimatorFactory.cpp
index 1a6689cbe1c22c28effbd5f95aab3549da62cca5..705c92861fc9532a5bac502f41a1cbd14d57f034 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/FilePositionEstimatorFactory.cpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/FilePositionEstimatorFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/FilePositionEstimatorFactory.hpp b/tapeserver/castor/tape/tapeserver/RAO/FilePositionEstimatorFactory.hpp
index 6f12dd4c77c8480585b28c86e6151395db2672cb..3a474427fb5447b1a954a80bf2a38b4cca9fa6ed 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/FilePositionEstimatorFactory.hpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/FilePositionEstimatorFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/FilePositionInfos.cpp b/tapeserver/castor/tape/tapeserver/RAO/FilePositionInfos.cpp
index 60e58425666ece9e2522dbaa19315728565e5c93..6202a50bee25a1e1876e415e9589264d06895ab1 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/FilePositionInfos.cpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/FilePositionInfos.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/FilePositionInfos.hpp b/tapeserver/castor/tape/tapeserver/RAO/FilePositionInfos.hpp
index df55cb7dbaf5ff6bdfb34a659bb8c8f59ea634b4..92de08dc497859f028edf85505510b9634f2ab94 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/FilePositionInfos.hpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/FilePositionInfos.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/InterpolationFilePositionEstimator.cpp b/tapeserver/castor/tape/tapeserver/RAO/InterpolationFilePositionEstimator.cpp
index cfba927800c6e255194343f89cbc9bf1dea75c63..9a455c69e5830255eb06270f6446e921d803ed4e 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/InterpolationFilePositionEstimator.cpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/InterpolationFilePositionEstimator.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/InterpolationFilePositionEstimator.hpp b/tapeserver/castor/tape/tapeserver/RAO/InterpolationFilePositionEstimator.hpp
index 062e51f251af50598ea9d73e032dacf71a16a811..cfd88cf2e21540f7b8f44b1dea264e46226a12d4 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/InterpolationFilePositionEstimator.hpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/InterpolationFilePositionEstimator.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/LinearRAOAlgorithm.cpp b/tapeserver/castor/tape/tapeserver/RAO/LinearRAOAlgorithm.cpp
index 6766c9a6297c7ab036e6c54191bb3f4de754cd23..37f6fb6b583ea8214235388bd02071095a719bdb 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/LinearRAOAlgorithm.cpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/LinearRAOAlgorithm.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/LinearRAOAlgorithm.hpp b/tapeserver/castor/tape/tapeserver/RAO/LinearRAOAlgorithm.hpp
index 191785110bd61166e11e0d32b4880e61b59dc651..c82e67c9859c23e1b3395e9e29d304d1a355797a 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/LinearRAOAlgorithm.hpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/LinearRAOAlgorithm.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/NonConfigurableRAOAlgorithmFactory.cpp b/tapeserver/castor/tape/tapeserver/RAO/NonConfigurableRAOAlgorithmFactory.cpp
index a804124fd23de39591f02a3b778b05355b5f7041..c89c8ab5b033796b48872d74d7e14ab0e5b7d7ed 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/NonConfigurableRAOAlgorithmFactory.cpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/NonConfigurableRAOAlgorithmFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/NonConfigurableRAOAlgorithmFactory.hpp b/tapeserver/castor/tape/tapeserver/RAO/NonConfigurableRAOAlgorithmFactory.hpp
index 08ff6d0ee2d91dbc703b6884639cef6e325e909b..332f2fa9cea0d82be6b1a7dc97c3e3aead21bc32 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/NonConfigurableRAOAlgorithmFactory.hpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/NonConfigurableRAOAlgorithmFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/Position.cpp b/tapeserver/castor/tape/tapeserver/RAO/Position.cpp
index 985f717cae81a7401c77b355f903fc1d3c728503..bb08871c4420e019ab42e161b60b06934c1a96e9 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/Position.cpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/Position.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/Position.hpp b/tapeserver/castor/tape/tapeserver/RAO/Position.hpp
index 391d7f5ae48f9d4f0290505001efa13af7f5b643..2da83a5e77ac259bb859738e89e60abc6c0b2a54 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/Position.hpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/Position.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/RAOAlgorithm.cpp b/tapeserver/castor/tape/tapeserver/RAO/RAOAlgorithm.cpp
index 4eb3d789f0b16aecbb05c77964d723a3e2bd5325..507c651b5733f9fe491fb1a5a7b26eaaefe04883 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/RAOAlgorithm.cpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/RAOAlgorithm.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/RAOAlgorithm.hpp b/tapeserver/castor/tape/tapeserver/RAO/RAOAlgorithm.hpp
index 13f1ead9926574c669aaf9b23e97e4721b04ea5a..3bbf407a276c0971f7e7297c938f2bd14935cffa 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/RAOAlgorithm.hpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/RAOAlgorithm.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/RAOAlgorithmFactory.cpp b/tapeserver/castor/tape/tapeserver/RAO/RAOAlgorithmFactory.cpp
index 09c7dec3e7978b1f07588d9df5e367fbfd0dc381..bebf581130f46f93cf221ee855231a3fee5f6803 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/RAOAlgorithmFactory.cpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/RAOAlgorithmFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/RAOAlgorithmFactory.hpp b/tapeserver/castor/tape/tapeserver/RAO/RAOAlgorithmFactory.hpp
index bfd2d968d7db8f132eab3f3dbe5d403b4e3418e2..8bca665cbaa35fb54ffa3cfde8d583db19669d78 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/RAOAlgorithmFactory.hpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/RAOAlgorithmFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/RAOAlgorithmFactoryFactory.cpp b/tapeserver/castor/tape/tapeserver/RAO/RAOAlgorithmFactoryFactory.cpp
index 907e06f8dd21351d5eaff30ed60404a4a645fbaf..417726fc79da49cd14eb2b6eb06ece9451b74bf1 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/RAOAlgorithmFactoryFactory.cpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/RAOAlgorithmFactoryFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/RAOAlgorithmFactoryFactory.hpp b/tapeserver/castor/tape/tapeserver/RAO/RAOAlgorithmFactoryFactory.hpp
index 05ffa07b508bfda0a3daf419ea263dddeb6d2d22..c1a78c78461b3ed3d0e5fc1e5c3b3e470963e872 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/RAOAlgorithmFactoryFactory.hpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/RAOAlgorithmFactoryFactory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/RAOFile.cpp b/tapeserver/castor/tape/tapeserver/RAO/RAOFile.cpp
index ebfd610bbd51f981d514d64533074cb3d9775be1..9212a3e2f71a36b626dc2c5a1d36955f82af8215 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/RAOFile.cpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/RAOFile.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/RAOFile.hpp b/tapeserver/castor/tape/tapeserver/RAO/RAOFile.hpp
index 6221cb5ef3492e612fee399669bf2e8a86f78198..a8ba8a1a174db4182327fb6061614954e883afc0 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/RAOFile.hpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/RAOFile.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/RAOHelpers.cpp b/tapeserver/castor/tape/tapeserver/RAO/RAOHelpers.cpp
index 094dabfa6a2765677084b3886d7fbdab21d0e272..e62419d10f325f284bc0d199106a80193cbf369a 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/RAOHelpers.cpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/RAOHelpers.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/RAOHelpers.hpp b/tapeserver/castor/tape/tapeserver/RAO/RAOHelpers.hpp
index 15c2f1027f315b1dce83b6e657463fc6089a6c17..fe284cbb2a95c0ac0b9799d76f146c62cc3af31a 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/RAOHelpers.hpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/RAOHelpers.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/RAOManager.cpp b/tapeserver/castor/tape/tapeserver/RAO/RAOManager.cpp
index f95b48dcbf33af7b9d4d583fded79a9a363a357b..34485239cbf239bfcf452ef64cacd0adcf0e8177 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/RAOManager.cpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/RAOManager.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/RAOManager.hpp b/tapeserver/castor/tape/tapeserver/RAO/RAOManager.hpp
index 54b550a1b7264af6df70b11e6def8e927a9a4883..9620053f6efa041edc358e7e7abfd51157f7acf8 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/RAOManager.hpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/RAOManager.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/RAOOptions.cpp b/tapeserver/castor/tape/tapeserver/RAO/RAOOptions.cpp
index bddafe294c3fc48e5acc573723987311ccc8f51e..808095aadbe62675d2440e99d4c4548af7aef840 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/RAOOptions.cpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/RAOOptions.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/RAOOptions.hpp b/tapeserver/castor/tape/tapeserver/RAO/RAOOptions.hpp
index e8ba6679dd67503b87d7bc1794d898c728e514b0..2fd5204016d5f6adbf0e78a705662361b578e845 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/RAOOptions.hpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/RAOOptions.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/RAOParams.cpp b/tapeserver/castor/tape/tapeserver/RAO/RAOParams.cpp
index 05f733ac0939e9dfe64392cfd09988dae57995af..fedd2b9ace1487e9ae8c5543abc2822b788d33a6 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/RAOParams.cpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/RAOParams.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/RAOParams.hpp b/tapeserver/castor/tape/tapeserver/RAO/RAOParams.hpp
index 20a10ee8b0d1505c767b50d23ba3e1e804229b03..f5bfde2ade4986f0c17b679bf0b86b6497681249 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/RAOParams.hpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/RAOParams.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/RAOTest.cpp b/tapeserver/castor/tape/tapeserver/RAO/RAOTest.cpp
index 107e6d29d9c060fbc9ec796148faf639d0ec51e5..62c54b32efbca141400262a3fa05a415f9d1c4dc 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/RAOTest.cpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/RAOTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/RandomRAOAlgorithm.cpp b/tapeserver/castor/tape/tapeserver/RAO/RandomRAOAlgorithm.cpp
index 0ba0dcd3c972e0159bbceea510d78d2ee99ba053..0e8895e567754e326958f0cd09d5c96c353e2d2d 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/RandomRAOAlgorithm.cpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/RandomRAOAlgorithm.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/RandomRAOAlgorithm.hpp b/tapeserver/castor/tape/tapeserver/RAO/RandomRAOAlgorithm.hpp
index a3ff66a04716f934d477ea09f3e3d81ca19c442e..c140f8fd183ad7b5d241c50e4a04a709d8a9991d 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/RandomRAOAlgorithm.hpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/RandomRAOAlgorithm.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/SLTFRAOAlgorithm.cpp b/tapeserver/castor/tape/tapeserver/RAO/SLTFRAOAlgorithm.cpp
index 2e1f80e4a952aebd173f79b251d2bea220fc2078..232021b236cfdbb66a9c18ec8175d3cfc3e571fe 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/SLTFRAOAlgorithm.cpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/SLTFRAOAlgorithm.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/RAO/SLTFRAOAlgorithm.hpp b/tapeserver/castor/tape/tapeserver/RAO/SLTFRAOAlgorithm.hpp
index c2de089db051100cef7fafc900a9981b888f0d75..99c521c90b09f6e43d1cc86abd90797590657ab5 100644
--- a/tapeserver/castor/tape/tapeserver/RAO/SLTFRAOAlgorithm.hpp
+++ b/tapeserver/castor/tape/tapeserver/RAO/SLTFRAOAlgorithm.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/SCSI/Constants.cpp b/tapeserver/castor/tape/tapeserver/SCSI/Constants.cpp
index ccd81d40f1603c281e1a816ca213b3bdc4c8d6a3..a0d61e286d308180d645ddae310189cac849ca41 100644
--- a/tapeserver/castor/tape/tapeserver/SCSI/Constants.cpp
+++ b/tapeserver/castor/tape/tapeserver/SCSI/Constants.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/SCSI/Constants.hpp b/tapeserver/castor/tape/tapeserver/SCSI/Constants.hpp
index 86d8a33f0d1100900614ae599b33b916408c7dd8..6e0a6cdc9d2014c90489aef0e106e9e35dd81003 100644
--- a/tapeserver/castor/tape/tapeserver/SCSI/Constants.hpp
+++ b/tapeserver/castor/tape/tapeserver/SCSI/Constants.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/SCSI/Device.cpp b/tapeserver/castor/tape/tapeserver/SCSI/Device.cpp
index c7e577972a1f50d7719084bc6c7c6fc816c063cb..be4140551489ba50994c25c1c767e4918a25e9cc 100644
--- a/tapeserver/castor/tape/tapeserver/SCSI/Device.cpp
+++ b/tapeserver/castor/tape/tapeserver/SCSI/Device.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/SCSI/Device.hpp b/tapeserver/castor/tape/tapeserver/SCSI/Device.hpp
index e6bd15b046065ed22c6ca1445bfd8945c6c7a8c8..138d5f1ddfb059b2bcaf7335503927e5d789a72f 100644
--- a/tapeserver/castor/tape/tapeserver/SCSI/Device.hpp
+++ b/tapeserver/castor/tape/tapeserver/SCSI/Device.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/SCSI/DeviceTest.cpp b/tapeserver/castor/tape/tapeserver/SCSI/DeviceTest.cpp
index 440d54c0a7acc7eef67dcb634b7715b674e6630e..ab7c54f224ebc6ec050b95c30bcc004afb59b53b 100644
--- a/tapeserver/castor/tape/tapeserver/SCSI/DeviceTest.cpp
+++ b/tapeserver/castor/tape/tapeserver/SCSI/DeviceTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/SCSI/DumpTest.cpp b/tapeserver/castor/tape/tapeserver/SCSI/DumpTest.cpp
index a6e51177f3cf886e8280f6e2825973377073ca25..5f06cc1ee65d9d95c41c78e9b0ec53b9cfd1fbf0 100644
--- a/tapeserver/castor/tape/tapeserver/SCSI/DumpTest.cpp
+++ b/tapeserver/castor/tape/tapeserver/SCSI/DumpTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/SCSI/Exception.cpp b/tapeserver/castor/tape/tapeserver/SCSI/Exception.cpp
index 9241e1f79216479ba72f819188b2e4d593f73db0..25120b059fe252d5364e8c38ac039f538042be20 100644
--- a/tapeserver/castor/tape/tapeserver/SCSI/Exception.cpp
+++ b/tapeserver/castor/tape/tapeserver/SCSI/Exception.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/SCSI/Exception.hpp b/tapeserver/castor/tape/tapeserver/SCSI/Exception.hpp
index 93c2b979507836a046f695c2ce9fb1c13daf7425..cbc630fc5180aef484606a134ff9429357cc1f2d 100644
--- a/tapeserver/castor/tape/tapeserver/SCSI/Exception.hpp
+++ b/tapeserver/castor/tape/tapeserver/SCSI/Exception.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/SCSI/Structures.cpp b/tapeserver/castor/tape/tapeserver/SCSI/Structures.cpp
index 83f8ee847863866206cec84e98c8bc8b7c4d4ce8..55cce770d545619398dcae38a8286b9c54130200 100644
--- a/tapeserver/castor/tape/tapeserver/SCSI/Structures.cpp
+++ b/tapeserver/castor/tape/tapeserver/SCSI/Structures.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/SCSI/Structures.hpp b/tapeserver/castor/tape/tapeserver/SCSI/Structures.hpp
index 9866afdc00f10ce3ff9b3762b5cbc0eb2f13e692..cd9e366baef93883b7983be9553c611a7f126bbc 100644
--- a/tapeserver/castor/tape/tapeserver/SCSI/Structures.hpp
+++ b/tapeserver/castor/tape/tapeserver/SCSI/Structures.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/SCSI/StructuresTest.cpp b/tapeserver/castor/tape/tapeserver/SCSI/StructuresTest.cpp
index 543786f71bc88134d0aad0700f12d7becdc5b1bf..e686b2e26071383ee6399f34ae25d2d35a91544d 100644
--- a/tapeserver/castor/tape/tapeserver/SCSI/StructuresTest.cpp
+++ b/tapeserver/castor/tape/tapeserver/SCSI/StructuresTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/TapeBridgeConstants.hpp b/tapeserver/castor/tape/tapeserver/TapeBridgeConstants.hpp
index a6892db6196b83ca2b585e3b53c0c509ad3970db..c6d3e944b115ed73a5431cca6b556f3a075023be 100644
--- a/tapeserver/castor/tape/tapeserver/TapeBridgeConstants.hpp
+++ b/tapeserver/castor/tape/tapeserver/TapeBridgeConstants.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/AutoReleaseBlock.hpp b/tapeserver/castor/tape/tapeserver/daemon/AutoReleaseBlock.hpp
index f28cccbdda9e8c1389e062431f1d417506af14d8..287839dbe586474752a9dbdb5c4d533450b32d5e 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/AutoReleaseBlock.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/AutoReleaseBlock.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/CleanerSession.cpp b/tapeserver/castor/tape/tapeserver/daemon/CleanerSession.cpp
index e1f720469ba3b91d0c423cf9334579b2ff4c7d71..e47c6e5bb06c1d7eaaba32310e591b6e13cc85d9 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/CleanerSession.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/CleanerSession.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/CleanerSession.hpp b/tapeserver/castor/tape/tapeserver/daemon/CleanerSession.hpp
index 7517e20249e5aca6ab3eaa1e6f5a565ce8ef5564..1c87ac0c0878660c915d779f8241e4c56a9ba532 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/CleanerSession.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/CleanerSession.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/Constants.hpp b/tapeserver/castor/tape/tapeserver/daemon/Constants.hpp
index 7b98cbd7b8cdf17b7e7abe02aaddde09fd10dbb6..362146321f5d6a3175dd562bed651d3b6ef1cf8a 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/Constants.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/Constants.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/DataConsumer.hpp b/tapeserver/castor/tape/tapeserver/daemon/DataConsumer.hpp
index 668217b65d579b3512a754d7d25523674ce1163a..368ea5c56598213b747f079fbd07f19d7b5d465b 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/DataConsumer.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/DataConsumer.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/DataPipeline.hpp b/tapeserver/castor/tape/tapeserver/daemon/DataPipeline.hpp
index 3fa237737ababb0a6ef9c027e159c6839f1233d2..af69f0f047316e64bbcbf5fabbf9553a942ba2f2 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/DataPipeline.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/DataPipeline.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/DataTransferConfig.cpp b/tapeserver/castor/tape/tapeserver/daemon/DataTransferConfig.cpp
index c441ae49fa0f33fb59e0ff6cbb2c96b93371a40c..d6da76b4afa53fa43f89123ca78bfa4456f6e552 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/DataTransferConfig.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/DataTransferConfig.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/DataTransferConfig.hpp b/tapeserver/castor/tape/tapeserver/daemon/DataTransferConfig.hpp
index 854b45390660aac38a94e6bc41398ac5f71cbd7e..7907d1f4a30a942303a5e6cf47275dc832c92159 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/DataTransferConfig.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/DataTransferConfig.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/DataTransferSession.cpp b/tapeserver/castor/tape/tapeserver/daemon/DataTransferSession.cpp
index 2e71c1146f89af56e889103e1ae15b320018caaa..c23a6cd41253f5aec60d8549d429035b9dc0c65e 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/DataTransferSession.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/DataTransferSession.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/DataTransferSession.hpp b/tapeserver/castor/tape/tapeserver/daemon/DataTransferSession.hpp
index 7a89dbc68230683ca430fd882f836e4ae42402c2..93343872e4d8cd412ef0ce94584491a1506c9e72 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/DataTransferSession.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/DataTransferSession.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/DataTransferSessionTest.cpp b/tapeserver/castor/tape/tapeserver/daemon/DataTransferSessionTest.cpp
index c2703a0f0d67d7c07c01fd633e21f0e862094b00..873f60bc55646a4ca464be2eb96b27ab02853024 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/DataTransferSessionTest.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/DataTransferSessionTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/DiskReadTask.cpp b/tapeserver/castor/tape/tapeserver/daemon/DiskReadTask.cpp
index 54b86ebc35de57ea6328409dd92e2f6c8924ccf1..8d940f0827c00f681a8b1925daeec7aa5d5757bf 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/DiskReadTask.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/DiskReadTask.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/DiskReadTask.hpp b/tapeserver/castor/tape/tapeserver/daemon/DiskReadTask.hpp
index 10167ee9d2ac6a98ea9fff652ef6d5f839675a76..c600047f7b080b57ea11f738561f923ba96843c5 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/DiskReadTask.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/DiskReadTask.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/DiskReadTaskTest.cpp b/tapeserver/castor/tape/tapeserver/daemon/DiskReadTaskTest.cpp
index de78cd75cfe3f9445e3689950f0bb4058705d527..61f0247e4bb4446de39f8762dafb421fa87f6ea6 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/DiskReadTaskTest.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/DiskReadTaskTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/DiskReadThreadPool.cpp b/tapeserver/castor/tape/tapeserver/daemon/DiskReadThreadPool.cpp
index 6e5431d663d8879c9d80a2ddd030c139912eb660..40ef2fa424a4fb3d240fa3e6740721e9c11a15e7 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/DiskReadThreadPool.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/DiskReadThreadPool.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/DiskReadThreadPool.hpp b/tapeserver/castor/tape/tapeserver/daemon/DiskReadThreadPool.hpp
index 86a0ea1bbc24ff499c2c7e48c0f4b23eff006171..733dafa2919bba3460fba021f79b1628ebbd8eef 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/DiskReadThreadPool.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/DiskReadThreadPool.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/DiskStats.hpp b/tapeserver/castor/tape/tapeserver/daemon/DiskStats.hpp
index 1cdca1f2e5e216ce1de7058ce967078e7f9f95c6..6f2674463a5e3ca36441b2355f5ee905405835be 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/DiskStats.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/DiskStats.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/DiskWriteTask.cpp b/tapeserver/castor/tape/tapeserver/daemon/DiskWriteTask.cpp
index 32f9ee4c467de52315f46efbe7f9ef0f1fcba0e8..da1f90baa8525aa770cee44e467d57992aa6dd38 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/DiskWriteTask.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/DiskWriteTask.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/DiskWriteTask.hpp b/tapeserver/castor/tape/tapeserver/daemon/DiskWriteTask.hpp
index 64c71aea94c83781f5a3f388ab9519421f00deb8..22a2ff6b921b6b39cfbbcf64b39ae4332c780d96 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/DiskWriteTask.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/DiskWriteTask.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/DiskWriteTaskTest.cpp b/tapeserver/castor/tape/tapeserver/daemon/DiskWriteTaskTest.cpp
index 637b5ac4a8b02a31d06570ae55f3444c80a0d4d6..3bb359ab21720a05d7cd5551b779ba06d6fd2f9d 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/DiskWriteTaskTest.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/DiskWriteTaskTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/DiskWriteThreadPool.cpp b/tapeserver/castor/tape/tapeserver/daemon/DiskWriteThreadPool.cpp
index 139d2470fd5c0c611d96ce46841cde434c28317f..b1a1db951fbc62f47ddc656069e64764d3a7d576 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/DiskWriteThreadPool.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/DiskWriteThreadPool.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/DiskWriteThreadPool.hpp b/tapeserver/castor/tape/tapeserver/daemon/DiskWriteThreadPool.hpp
index 6e7e7d11a49bf09067b2f716fe2c64bd9532e34c..a6de06c543689082ac130e020b5f080af86ceac9 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/DiskWriteThreadPool.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/DiskWriteThreadPool.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/DiskWriteThreadPoolTest.cpp b/tapeserver/castor/tape/tapeserver/daemon/DiskWriteThreadPoolTest.cpp
index 8f0f29babc0abfe33172ac2030fc7d9cb401828d..e232158764768e44a49b0b2551d32d884666afcd 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/DiskWriteThreadPoolTest.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/DiskWriteThreadPoolTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/EmptyDriveProbe.cpp b/tapeserver/castor/tape/tapeserver/daemon/EmptyDriveProbe.cpp
index 3377f7c3a7a8dca0d6654b704b2f0b2acb3e1c4c..467a92dc01ce16332ae338c1eb42662af7c8b1ec 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/EmptyDriveProbe.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/EmptyDriveProbe.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/EmptyDriveProbe.hpp b/tapeserver/castor/tape/tapeserver/daemon/EmptyDriveProbe.hpp
index e4c33e90779339c002a981b280c7fa60599945b3..3b07bf19192c5aecfc5a520e1d0347b707b88a55 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/EmptyDriveProbe.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/EmptyDriveProbe.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/EncryptionControl.cpp b/tapeserver/castor/tape/tapeserver/daemon/EncryptionControl.cpp
index e1c7e65e2dcc94b73cea80de0a06266db4c4d7dd..20e47b24d866856633ec91fa2c9af69ee889061b 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/EncryptionControl.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/EncryptionControl.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/EncryptionControl.hpp b/tapeserver/castor/tape/tapeserver/daemon/EncryptionControl.hpp
index ddc038fb1a2d3d00ff28c2b4e3767f8e1fb95738..ccca96b74b71fe39d9c7563ea86922599ae81e13 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/EncryptionControl.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/EncryptionControl.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/ErrorFlag.hpp b/tapeserver/castor/tape/tapeserver/daemon/ErrorFlag.hpp
index f61d204c4791753024be7ceb2c9ee1266498b88b..3b07757bdfc4ec243269916e87ba4983d51f48d8 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/ErrorFlag.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/ErrorFlag.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/LabelSession.cpp b/tapeserver/castor/tape/tapeserver/daemon/LabelSession.cpp
index ca3740c403371a5176ef134dcc0b505eb2f66a69..4e4c1dbe64ac94b3b95c0a87e1aff5e0cb9284be 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/LabelSession.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/LabelSession.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/LabelSession.hpp b/tapeserver/castor/tape/tapeserver/daemon/LabelSession.hpp
index 9e343422daf193b8d32dbe6f8fbd1380e261291a..0f3ae1ef62c917452f74661a39282cdd163a42fb 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/LabelSession.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/LabelSession.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/LabelSessionConfig.cpp b/tapeserver/castor/tape/tapeserver/daemon/LabelSessionConfig.cpp
index ab052e0234108f04023063076d5649f9e94bde91..ab0464dd14f280feb817ef7c6b2736650f7085f9 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/LabelSessionConfig.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/LabelSessionConfig.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/LabelSessionConfig.hpp b/tapeserver/castor/tape/tapeserver/daemon/LabelSessionConfig.hpp
index ce62568e4a371d9790d4a4be345f0c5f7867b026..2005e4837e87ec4fe9865ddfe74a5c5a6e78c9a9 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/LabelSessionConfig.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/LabelSessionConfig.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/MemBlock.hpp b/tapeserver/castor/tape/tapeserver/daemon/MemBlock.hpp
index 94c0eb14b721ec632abb3688f4f8f3739145cbcf..ec314a0327b4a3e0e532d40596e3ea4665b5b322 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/MemBlock.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/MemBlock.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/MigrationMemoryManager.cpp b/tapeserver/castor/tape/tapeserver/daemon/MigrationMemoryManager.cpp
index 33d54137fdf9e01a325b8f901d6e55c18f364b6a..5411c4b8dcb917ec3d7be506c26c1733bfe08565 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/MigrationMemoryManager.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/MigrationMemoryManager.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/MigrationMemoryManager.hpp b/tapeserver/castor/tape/tapeserver/daemon/MigrationMemoryManager.hpp
index f7730d69df110f66ca801b50e930e86a79698fd5..a4a8219e368cc9e4953ae5755e39d8788837c114 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/MigrationMemoryManager.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/MigrationMemoryManager.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/MigrationReportPacker.cpp b/tapeserver/castor/tape/tapeserver/daemon/MigrationReportPacker.cpp
index d428a560bde254a03a65ce6cac824c9179dfbff1..70d3cb2888aa5877caf104fd193c17ab56cbe3e8 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/MigrationReportPacker.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/MigrationReportPacker.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/MigrationReportPacker.hpp b/tapeserver/castor/tape/tapeserver/daemon/MigrationReportPacker.hpp
index 843ee0adf147fe19d53a7faddbcdafb36daf6bba..88b4022b038ca461a1739da87c902f977ba35721 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/MigrationReportPacker.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/MigrationReportPacker.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/MigrationReportPackerTest.cpp b/tapeserver/castor/tape/tapeserver/daemon/MigrationReportPackerTest.cpp
index 0069581438914b17ac0779ab811d2bab270edacb..df3e47b3d6a939d6ec1b512843d33740941296e7 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/MigrationReportPackerTest.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/MigrationReportPackerTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/MigrationTaskInjector.cpp b/tapeserver/castor/tape/tapeserver/daemon/MigrationTaskInjector.cpp
index 47b4327a08669ac5e5af587168bc544b06c4c4cf..669f413c38dc98c94f6678f6488e09d1fb1ae4b7 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/MigrationTaskInjector.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/MigrationTaskInjector.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/MigrationTaskInjector.hpp b/tapeserver/castor/tape/tapeserver/daemon/MigrationTaskInjector.hpp
index d9f1440551f07d75e731b0b9e25a3ff8e33c3108..45a1cea3b87ce0fef796ac4d14cb2f41c06b20c7 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/MigrationTaskInjector.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/MigrationTaskInjector.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/Payload.hpp b/tapeserver/castor/tape/tapeserver/daemon/Payload.hpp
index f4204be04dd70ffc21342c13147a0e168b9794da..b187e6c00c97bf094318e2991079cf6cee48822f 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/Payload.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/Payload.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/RecallMemoryManager.cpp b/tapeserver/castor/tape/tapeserver/daemon/RecallMemoryManager.cpp
index f17392c584a5b1d8cb2f7a55b796e7d8c63c0312..176aa4cc85cb5fa02aec51f8c46134310f20624b 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/RecallMemoryManager.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/RecallMemoryManager.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/RecallMemoryManager.hpp b/tapeserver/castor/tape/tapeserver/daemon/RecallMemoryManager.hpp
index 9d92ad0db8210632d983a227a506e051b552963f..032467bcf6ac60a43db140e971c17d4bef66ca15 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/RecallMemoryManager.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/RecallMemoryManager.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/RecallReportPacker.cpp b/tapeserver/castor/tape/tapeserver/daemon/RecallReportPacker.cpp
index 5c4195a900f05ba473374f1ea3f69d2d73d93140..4c4cd16a343f3be89c32259db82ad2b03b0dcc77 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/RecallReportPacker.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/RecallReportPacker.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/RecallReportPacker.hpp b/tapeserver/castor/tape/tapeserver/daemon/RecallReportPacker.hpp
index 4123270ff8f356bbf8a8c50513b9482cf2def4ee..ea8f9f801ddfba594dbbb73b6cbe5c542ede62e7 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/RecallReportPacker.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/RecallReportPacker.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/RecallReportPackerTest.cpp b/tapeserver/castor/tape/tapeserver/daemon/RecallReportPackerTest.cpp
index 379a81e0f194005e5c50ad8c8f0198d69db31eee..5941becf8e96c4d649508590cfa897df3fdde255 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/RecallReportPackerTest.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/RecallReportPackerTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/RecallTaskInjector.cpp b/tapeserver/castor/tape/tapeserver/daemon/RecallTaskInjector.cpp
index cff14e0ef61f3220cdadf379897604d3effcc3b8..595a27fa9cb2838a3ed8128dac90ea3ab7c7f915 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/RecallTaskInjector.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/RecallTaskInjector.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/RecallTaskInjector.hpp b/tapeserver/castor/tape/tapeserver/daemon/RecallTaskInjector.hpp
index 43ad3a9fd8fa627601e4a676230015c020f36807..a865db15377dd9bba7372b077128f9ed25ae4770 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/RecallTaskInjector.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/RecallTaskInjector.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/RecallTaskInjectorTest.cpp b/tapeserver/castor/tape/tapeserver/daemon/RecallTaskInjectorTest.cpp
index 9644414822499dafbfc08bc83474f898f2c54c4a..01f833ab6702283df2446183fa082ee784238fee 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/RecallTaskInjectorTest.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/RecallTaskInjectorTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/ReportPackerInterface.hpp b/tapeserver/castor/tape/tapeserver/daemon/ReportPackerInterface.hpp
index b3d8cfee464f647a3e0838bcb0748dabd2a5a19c..67781c3afc4cdbdbfa6f4f658424a52830232912 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/ReportPackerInterface.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/ReportPackerInterface.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/Session.cpp b/tapeserver/castor/tape/tapeserver/daemon/Session.cpp
index 19b2ca1ca9119e73a3d77c76e75571da42ac5905..16d7514e9d07369e921dd6c09506ba88b2d8d123 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/Session.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/Session.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/Session.hpp b/tapeserver/castor/tape/tapeserver/daemon/Session.hpp
index aa5fedcc24508e1e1b4b38395bcde9f350537b7c..5aafc9b9a75f9964765a9cdd87986153100f832a 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/Session.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/Session.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/TapeReadSingleThread.cpp b/tapeserver/castor/tape/tapeserver/daemon/TapeReadSingleThread.cpp
index 9a0834fffd43d2c824f8301f9e414740aab38df4..a0b122c996e99804ac2642f14dad558ddafa1b83 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/TapeReadSingleThread.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/TapeReadSingleThread.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/TapeReadSingleThread.hpp b/tapeserver/castor/tape/tapeserver/daemon/TapeReadSingleThread.hpp
index 0946badaa969b582ae9e177c6839abd78be9a0fb..dbb56bd4fc0c6cb73d8de16ba588e2592cc50ba1 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/TapeReadSingleThread.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/TapeReadSingleThread.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/TapeReadTask.hpp b/tapeserver/castor/tape/tapeserver/daemon/TapeReadTask.hpp
index cd0c3a585aecd8955a1a454ce3d7b75e4c525024..85f345fbf52db515c474099a7afc2401a98cb656 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/TapeReadTask.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/TapeReadTask.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/TapeServerReporter.cpp b/tapeserver/castor/tape/tapeserver/daemon/TapeServerReporter.cpp
index 355ac7ad7b1e7a54238144876304caa7ad4651e6..33889ae032f85f9a70891bb87f2136d065b577c4 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/TapeServerReporter.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/TapeServerReporter.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/TapeServerReporter.hpp b/tapeserver/castor/tape/tapeserver/daemon/TapeServerReporter.hpp
index 1ef84f9ea86c36fba13875b1e16fddc8de63371b..8199100c3547f3574f8905cdceb7e933da293fda 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/TapeServerReporter.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/TapeServerReporter.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/TapeSessionStats.hpp b/tapeserver/castor/tape/tapeserver/daemon/TapeSessionStats.hpp
index 69bbb8e51b4aecd21ebb1b2f225835d4462609d1..652ce7f31d8cec9d42c679ec1f6e744e5a7cba86 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/TapeSessionStats.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/TapeSessionStats.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/TapeSingleThreadInterface.hpp b/tapeserver/castor/tape/tapeserver/daemon/TapeSingleThreadInterface.hpp
index 9fc9398613256d14bc729abc88b98dcafb8615bf..7d31468130edac6fa43dd66b7fe1d691e17ab53c 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/TapeSingleThreadInterface.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/TapeSingleThreadInterface.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/TapeWriteSingleThread.cpp b/tapeserver/castor/tape/tapeserver/daemon/TapeWriteSingleThread.cpp
index 385420e76a214525cd07b9846ace8e70516f991b..8b90bedc75890185906e764caede29ca5548507d 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/TapeWriteSingleThread.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/TapeWriteSingleThread.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/TapeWriteSingleThread.hpp b/tapeserver/castor/tape/tapeserver/daemon/TapeWriteSingleThread.hpp
index dca12b787fcf70d9f8705f84fbf536eb28cebf9a..ad1cb963c1aa3bfb3db587807a5ae3aa1a9f5360 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/TapeWriteSingleThread.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/TapeWriteSingleThread.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/TapeWriteTask.cpp b/tapeserver/castor/tape/tapeserver/daemon/TapeWriteTask.cpp
index ba21f9a9b51322a98dd988449a89ed597c9eaaf7..0d305a23154757144c50b575af458d9eb8f8ed83 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/TapeWriteTask.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/TapeWriteTask.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/TapeWriteTask.hpp b/tapeserver/castor/tape/tapeserver/daemon/TapeWriteTask.hpp
index 60d45d1c7b317df3a41a1fdf8a4d5aabca22e08e..f522c2ea667ca0db23ab54de1e6b65d25ae156c6 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/TapeWriteTask.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/TapeWriteTask.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/TaskWatchDog.hpp b/tapeserver/castor/tape/tapeserver/daemon/TaskWatchDog.hpp
index 085e2da7cd826fea20910af0aaaf965be5ae6bf5..75c962345157202239b58142d8671e92407f1ef7 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/TaskWatchDog.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/TaskWatchDog.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/TaskWatchDogTest.cpp b/tapeserver/castor/tape/tapeserver/daemon/TaskWatchDogTest.cpp
index a33d284739030d114610683beb4ab40679752b5b..bddc989a0a88be53306aa87fc6d81c985d601081 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/TaskWatchDogTest.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/TaskWatchDogTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/daemon/VolumeInfo.hpp b/tapeserver/castor/tape/tapeserver/daemon/VolumeInfo.hpp
index f6f8a9927dbf945cbff3ccd4ba2bdfe8f00b5214..08620bb14d7d566f94f561cf1cbf50369a5020b4 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/VolumeInfo.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/VolumeInfo.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp b/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp
index 8480563952af64d7c322117882c4a2b7af90dba8..73a8b3c543c11fd8531c346cfb287ddd93f72bcd 100644
--- a/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp
+++ b/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.hpp b/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.hpp
index 60c480b072464a4e992584418f89ed00630d8c37..575ea21c3b9edbd91de9490cd5313929f302243f 100644
--- a/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.hpp
+++ b/tapeserver/castor/tape/tapeserver/drive/DriveGeneric.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/drive/DriveInterface.hpp b/tapeserver/castor/tape/tapeserver/drive/DriveInterface.hpp
index 878de4ed82e5ee9e310e1886d69e1b94e35bc3cd..28048c419e28b0feb79f753c2d7bec391a6c4ca4 100644
--- a/tapeserver/castor/tape/tapeserver/drive/DriveInterface.hpp
+++ b/tapeserver/castor/tape/tapeserver/drive/DriveInterface.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/drive/DriveTest.cpp b/tapeserver/castor/tape/tapeserver/drive/DriveTest.cpp
index 0b23c818412ed8f65c6faee544d47dbde7efd572..82fe89ff20751e8daf35e0a4dbacbe8ede63dbdf 100644
--- a/tapeserver/castor/tape/tapeserver/drive/DriveTest.cpp
+++ b/tapeserver/castor/tape/tapeserver/drive/DriveTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/drive/FakeDrive.cpp b/tapeserver/castor/tape/tapeserver/drive/FakeDrive.cpp
index 5904ed400b53cf4b74df8faa704e81d744511ab2..4f8025a13999f552f58a539ceb0a9c76ede99098 100644
--- a/tapeserver/castor/tape/tapeserver/drive/FakeDrive.cpp
+++ b/tapeserver/castor/tape/tapeserver/drive/FakeDrive.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/drive/FakeDrive.hpp b/tapeserver/castor/tape/tapeserver/drive/FakeDrive.hpp
index 973300e3cb943f47a87fb739e0ef979d76e333a0..4903edaaa8866373e0c96f905fe46f0bd4b36846 100644
--- a/tapeserver/castor/tape/tapeserver/drive/FakeDrive.hpp
+++ b/tapeserver/castor/tape/tapeserver/drive/FakeDrive.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/drive/TapeDriveReadWriteTest.cpp b/tapeserver/castor/tape/tapeserver/drive/TapeDriveReadWriteTest.cpp
index e14d694f1c49fbdfa07c7784ebae874277627baa..a1943bd30b283a97602769cb7d6e5f9f4582dadd 100644
--- a/tapeserver/castor/tape/tapeserver/drive/TapeDriveReadWriteTest.cpp
+++ b/tapeserver/castor/tape/tapeserver/drive/TapeDriveReadWriteTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/drive/mtio_add.hpp b/tapeserver/castor/tape/tapeserver/drive/mtio_add.hpp
index 0248b69672f9004bcd5041a7c48f8c6990b2787b..540846d64975d00946fd787ac1dbbecbbe72bc0b 100644
--- a/tapeserver/castor/tape/tapeserver/drive/mtio_add.hpp
+++ b/tapeserver/castor/tape/tapeserver/drive/mtio_add.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/file/BasicReadWriteTest.cpp b/tapeserver/castor/tape/tapeserver/file/BasicReadWriteTest.cpp
index 1c06751021fd7930bdff80b1ea7db7b13e5567ed..b0c8876e88144ccf696c2821d08bd4d5ae1c629e 100644
--- a/tapeserver/castor/tape/tapeserver/file/BasicReadWriteTest.cpp
+++ b/tapeserver/castor/tape/tapeserver/file/BasicReadWriteTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/file/File.cpp b/tapeserver/castor/tape/tapeserver/file/File.cpp
index 1b03cfc3d5c556b88134fb723cf85cc1bde850e0..f8e7757a458e7b06bd88cac34daf88affdf930bc 100644
--- a/tapeserver/castor/tape/tapeserver/file/File.cpp
+++ b/tapeserver/castor/tape/tapeserver/file/File.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/file/File.hpp b/tapeserver/castor/tape/tapeserver/file/File.hpp
index 3909f89b3a5ad7601ccb6a732513917988758d3b..161d569b1e6d35299428b6de0081931a08e86120 100644
--- a/tapeserver/castor/tape/tapeserver/file/File.hpp
+++ b/tapeserver/castor/tape/tapeserver/file/File.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/file/FileTest.cpp b/tapeserver/castor/tape/tapeserver/file/FileTest.cpp
index 129d09178de496aca0ce4e2bdbb3202d269664c3..c15b069b697ec8b8b8af60d21c0daafb425fcc2d 100644
--- a/tapeserver/castor/tape/tapeserver/file/FileTest.cpp
+++ b/tapeserver/castor/tape/tapeserver/file/FileTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/file/Structures.cpp b/tapeserver/castor/tape/tapeserver/file/Structures.cpp
index 60a8753f5af9f3c086b7f3b71ad2ec5ffa79936c..97d1e594653787d7649eefbf81d9dc2899b02ebc 100644
--- a/tapeserver/castor/tape/tapeserver/file/Structures.cpp
+++ b/tapeserver/castor/tape/tapeserver/file/Structures.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/file/Structures.hpp b/tapeserver/castor/tape/tapeserver/file/Structures.hpp
index fe381c1295abf5333d02c048a59ee3f25cf3e18f..5ab7d16a09fbc3efc53c26ecc69ef6fb2183bfc9 100644
--- a/tapeserver/castor/tape/tapeserver/file/Structures.hpp
+++ b/tapeserver/castor/tape/tapeserver/file/Structures.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/file/StructuresTest.cpp b/tapeserver/castor/tape/tapeserver/file/StructuresTest.cpp
index b3be12ca770028ba9976e2550f5e2ebd15d46175..94174a2416db3acae5cbbae241d85e4147fd305a 100644
--- a/tapeserver/castor/tape/tapeserver/file/StructuresTest.cpp
+++ b/tapeserver/castor/tape/tapeserver/file/StructuresTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/system/FileWrappers.cpp b/tapeserver/castor/tape/tapeserver/system/FileWrappers.cpp
index ea7a70356ea7f19ebf1a3118ee6504e0515eaa5d..043dc1b9377023cb019915c89e488bdd9648e3e4 100644
--- a/tapeserver/castor/tape/tapeserver/system/FileWrappers.cpp
+++ b/tapeserver/castor/tape/tapeserver/system/FileWrappers.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/system/FileWrappers.hpp b/tapeserver/castor/tape/tapeserver/system/FileWrappers.hpp
index fd75f5f569d8df26bccbbdf1d6830d16c6707848..5026e628645710cf1a832c0a4aa53f3c9448606b 100644
--- a/tapeserver/castor/tape/tapeserver/system/FileWrappers.hpp
+++ b/tapeserver/castor/tape/tapeserver/system/FileWrappers.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/system/Wrapper.cpp b/tapeserver/castor/tape/tapeserver/system/Wrapper.cpp
index abc8efda810a9b59ea6cdea550bb5c2444549e11..9239bb296bf058ffb492ee3a2351df04d4805f50 100644
--- a/tapeserver/castor/tape/tapeserver/system/Wrapper.cpp
+++ b/tapeserver/castor/tape/tapeserver/system/Wrapper.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/system/Wrapper.hpp b/tapeserver/castor/tape/tapeserver/system/Wrapper.hpp
index 19200abee9947d08ac2ef64420e4678e934749c7..de40d080faa1bab8458bf8089ed3f72e0b7b1322 100644
--- a/tapeserver/castor/tape/tapeserver/system/Wrapper.hpp
+++ b/tapeserver/castor/tape/tapeserver/system/Wrapper.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/test/SystemTest/tape-server-system-test.sh b/tapeserver/castor/tape/tapeserver/test/SystemTest/tape-server-system-test.sh
index 6d1187669f45c3802a10904ba8a49c9e13cb7224..9dd28118762106eee7a331b90519bc099938b661 100644
--- a/tapeserver/castor/tape/tapeserver/test/SystemTest/tape-server-system-test.sh
+++ b/tapeserver/castor/tape/tapeserver/test/SystemTest/tape-server-system-test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # @project        The CERN Tape Archive (CTA)
-# @copyright      Copyright(C) 2021 CERN
+# @copyright      Copyright(C) 2003-2021 CERN
 # @license        This program is free software: you can redistribute it and/or modify
 #                 it under the terms of the GNU General Public License as published by
 #                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/castor/tape/tapeserver/utils/suppressUnusedVariable.hpp b/tapeserver/castor/tape/tapeserver/utils/suppressUnusedVariable.hpp
index 9e51034d05f2a5fe4520b6a1f663a2fea2eb4695..c58ce0300b2a18f2c69a1562e937909612cebea2 100644
--- a/tapeserver/castor/tape/tapeserver/utils/suppressUnusedVariable.hpp
+++ b/tapeserver/castor/tape/tapeserver/utils/suppressUnusedVariable.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2003-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/cta-taped.cpp b/tapeserver/cta-taped.cpp
index 0fc356cb9645de22971cba4ba11f7d233ef4d6f7..018598a13f2cf044dae34ae50924aa7cd4f6a0fd 100644
--- a/tapeserver/cta-taped.cpp
+++ b/tapeserver/cta-taped.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -51,7 +51,7 @@ static int exceptionThrowingMain(const cta::daemon::CommandLineParams & commandL
 //------------------------------------------------------------------------------
 // The help string
 //------------------------------------------------------------------------------
-std::string gHelpString = 
+std::string gHelpString =
     "Usage: cta-taped [options]\n"
     "\n"
     "where options can be:\n"
@@ -115,7 +115,7 @@ static int exceptionThrowingMain(
     std::list<cta::log::Param> params = {cta::log::Param("logMask", globalConfig.logMask.value())};
     log(log::INFO, "Set log mask", params);
   }
-  
+
   // Create the object providing utilities for working with UNIX capabilities
   cta::server::ProcessCap capUtils;
 
@@ -191,7 +191,7 @@ void logStartOfDaemon(cta::log::Logger &log,
 //------------------------------------------------------------------------------
 int main(const int argc, char **const argv) {
   using namespace cta;
-  
+
   // Interpret the command line
   std::unique_ptr<cta::daemon::CommandLineParams> commandLine;
   try {
@@ -202,7 +202,7 @@ int main(const int argc, char **const argv) {
       ex.getMessage().str() << std::endl;
     return EXIT_FAILURE;
   }
-  
+
   if(commandLine->helpRequested) {
     std::cout << cta::taped::gHelpString << std::endl;
     return EXIT_SUCCESS;
diff --git a/tapeserver/cta-tapedSystemtests.cpp b/tapeserver/cta-tapedSystemtests.cpp
index 479c2c35861d4a8498c2f2d3478d50a4631f3ac6..6309ee3e586505216d92779a27fcf5ce240755f6 100644
--- a/tapeserver/cta-tapedSystemtests.cpp
+++ b/tapeserver/cta-tapedSystemtests.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -20,9 +20,9 @@
 
 #include <gtest/gtest.h>
 
-namespace systemTests {  
+namespace systemTests {
 TEST(cta_taped, InvocationTests) {
-  {  
+  {
     // Do we get help with -h or --help?
     cta::threading::SubProcess spHelpShort("cta-taped", std::list<std::string>({"cta-taped", "-h"}));
     spHelpShort.wait();
@@ -35,7 +35,7 @@ TEST(cta_taped, InvocationTests) {
     ASSERT_TRUE(spHelpLong.stderr().empty());
     ASSERT_EQ(EXIT_SUCCESS, spHelpLong.exitValue());
   }
-  
+
   {
     // Do we get proper complaint when the configuration file is not there?
     cta::threading::SubProcess spNoConfigFile("cta-taped", std::list<std::string>({"cta-taped", "-f", "-s", "-c", "/no/such/file"}));
@@ -44,7 +44,7 @@ TEST(cta_taped, InvocationTests) {
     ASSERT_TRUE(spNoConfigFile.stderr().empty());
     ASSERT_EQ(EXIT_FAILURE, spNoConfigFile.exitValue());
   }
-  
+
   // Does the tape server complain about absence of drive configuration?
   {
     // We provide le daemon with an existing (but almost empty) configuration
diff --git a/tapeserver/daemon/CommandLineParams.cpp b/tapeserver/daemon/CommandLineParams.cpp
index e15a1a3a2411889ef8fc5a615a2d7dbaaa44a0d0..57655e51fe60bfba1d1f616d3d91b709733503a9 100644
--- a/tapeserver/daemon/CommandLineParams.cpp
+++ b/tapeserver/daemon/CommandLineParams.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/CommandLineParams.hpp b/tapeserver/daemon/CommandLineParams.hpp
index 43e2bf4192745b211805dcd06662d3cd69c9d6c6..1208ddaee2257e34b76bf03b49dd80760b613d12 100644
--- a/tapeserver/daemon/CommandLineParams.hpp
+++ b/tapeserver/daemon/CommandLineParams.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/DriveHandler.cpp b/tapeserver/daemon/DriveHandler.cpp
index d75de0917df594803d8e51c193de90cebda2c5de..63ed4b58e8e6a9e6907d49fe2751cab3d367954c 100644
--- a/tapeserver/daemon/DriveHandler.cpp
+++ b/tapeserver/daemon/DriveHandler.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/DriveHandler.hpp b/tapeserver/daemon/DriveHandler.hpp
index e0572de32bc2f87a5dac0e9715d4e496e9753f2c..ed94ecc95ad04d35638d0f581616182e6e900b97 100644
--- a/tapeserver/daemon/DriveHandler.hpp
+++ b/tapeserver/daemon/DriveHandler.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/DriveHandlerProxy.cpp b/tapeserver/daemon/DriveHandlerProxy.cpp
index 1d4acfca578dc8de486f8ab040dba089e53b09f1..468141837c50ef77cf0de24c727e18746fa47064 100644
--- a/tapeserver/daemon/DriveHandlerProxy.cpp
+++ b/tapeserver/daemon/DriveHandlerProxy.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/DriveHandlerProxy.hpp b/tapeserver/daemon/DriveHandlerProxy.hpp
index 609c7e3bbe1c9e6b8a5d4e4f592046e1be0830d8..9dd6bf9f1c058df6e61de150c7d33f83723d40e0 100644
--- a/tapeserver/daemon/DriveHandlerProxy.hpp
+++ b/tapeserver/daemon/DriveHandlerProxy.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/FetchReportOrFlushLimits.hpp b/tapeserver/daemon/FetchReportOrFlushLimits.hpp
index b1145aa9886f042fbc585ebaa1474ef52e9a73e6..42e747b79c09c1108d4a7034e9bb3e2504a98e27 100644
--- a/tapeserver/daemon/FetchReportOrFlushLimits.hpp
+++ b/tapeserver/daemon/FetchReportOrFlushLimits.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/MaintenanceHandler.cpp b/tapeserver/daemon/MaintenanceHandler.cpp
index 7c9d3603399db55246987de6f683af6bca8a5c3f..9476a755d6d4ccbb9d3303390a19d73bbc03b8fc 100644
--- a/tapeserver/daemon/MaintenanceHandler.cpp
+++ b/tapeserver/daemon/MaintenanceHandler.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/MaintenanceHandler.hpp b/tapeserver/daemon/MaintenanceHandler.hpp
index 106a7f320293829aaa442d7b2ee64fb8c012e3f5..acdc6ffb10d4cf19e531da4a52da38a40268c2b1 100644
--- a/tapeserver/daemon/MaintenanceHandler.hpp
+++ b/tapeserver/daemon/MaintenanceHandler.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/ProcessManager.cpp b/tapeserver/daemon/ProcessManager.cpp
index ec54c49d72b5ddf343f026f50a2ea9d2e677f8bb..0266abffe3c53113274b165356a2cfa532d1e78b 100644
--- a/tapeserver/daemon/ProcessManager.cpp
+++ b/tapeserver/daemon/ProcessManager.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/ProcessManager.hpp b/tapeserver/daemon/ProcessManager.hpp
index 5fae8edbc0777a824137361b8a751ff6c8b41cdd..dd643feda326e7c0fe0119f0a1e733a77e79b03f 100644
--- a/tapeserver/daemon/ProcessManager.hpp
+++ b/tapeserver/daemon/ProcessManager.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/ProcessManagerTests.cpp b/tapeserver/daemon/ProcessManagerTests.cpp
index 3c881622fbe50ff40092cebde3492845d4b2c790..84d8ea58cfaeb226324ff137ddcb0e979134be0f 100644
--- a/tapeserver/daemon/ProcessManagerTests.cpp
+++ b/tapeserver/daemon/ProcessManagerTests.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/SignalHandler.cpp b/tapeserver/daemon/SignalHandler.cpp
index d71d16eb943160c9eb1cd93a57ad3ea6d0d706d5..a4f11c7f0c7cf0c8dfae6a10700d8fffd144d19b 100644
--- a/tapeserver/daemon/SignalHandler.cpp
+++ b/tapeserver/daemon/SignalHandler.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/SignalHandler.hpp b/tapeserver/daemon/SignalHandler.hpp
index a1b3b9f6935691ed8ac56eae94fae8e9e395a4e4..1bbe15d5fa21d20800b7bbea6b22be8cef222693 100644
--- a/tapeserver/daemon/SignalHandler.hpp
+++ b/tapeserver/daemon/SignalHandler.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/SignalHandlerTests.cpp b/tapeserver/daemon/SignalHandlerTests.cpp
index 80a18f8b1223789bacbdfffd33d17943bf10a472..58bc4cbf46b5d7c9863a35381d863cd7194a9e2c 100644
--- a/tapeserver/daemon/SignalHandlerTests.cpp
+++ b/tapeserver/daemon/SignalHandlerTests.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/SubprocessHandler.cpp b/tapeserver/daemon/SubprocessHandler.cpp
index f094977b1ddbc6e1264542737f1f6c01f5e8c17a..a71886135fe359d626d7419c8da894866b51ee10 100644
--- a/tapeserver/daemon/SubprocessHandler.cpp
+++ b/tapeserver/daemon/SubprocessHandler.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/SubprocessHandler.hpp b/tapeserver/daemon/SubprocessHandler.hpp
index be0a593dddf585ee9b1ed4b3205571cdc387465a..c03fdd358f8701381ed564327730801efb702e3f 100644
--- a/tapeserver/daemon/SubprocessHandler.hpp
+++ b/tapeserver/daemon/SubprocessHandler.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/TapeDaemon.cpp b/tapeserver/daemon/TapeDaemon.cpp
index bc4dbd0b7a8e6c5a0c087e231d00cbf672544b04..dbe87ec933500cec0fc037fa468cc1bf999975c0 100644
--- a/tapeserver/daemon/TapeDaemon.cpp
+++ b/tapeserver/daemon/TapeDaemon.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/TapeDaemon.hpp b/tapeserver/daemon/TapeDaemon.hpp
index bd12ff2e5a5d323bb7a8e80e18add2f9966d93a7..fdbbcc052d8261ae0e42b45dda59f7d63261f518 100644
--- a/tapeserver/daemon/TapeDaemon.hpp
+++ b/tapeserver/daemon/TapeDaemon.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/TapedConfiguration.cpp b/tapeserver/daemon/TapedConfiguration.cpp
index a8c8a3b81b59f3e3f23856b294b5eaebdaaf9210..530f63b4da07e46651700dba228cbfd33789e1d1 100644
--- a/tapeserver/daemon/TapedConfiguration.cpp
+++ b/tapeserver/daemon/TapedConfiguration.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/TapedConfiguration.hpp b/tapeserver/daemon/TapedConfiguration.hpp
index e040bd4b66caddf2d7964d43fbb0d443cca1cb59..d975ce72c1fb702c9a0debde3af8038965a86e1c 100644
--- a/tapeserver/daemon/TapedConfiguration.hpp
+++ b/tapeserver/daemon/TapedConfiguration.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/TapedConfigurationTests.cpp b/tapeserver/daemon/TapedConfigurationTests.cpp
index 7086990cc42ad5ae9a90a5fd1bcdd97873a858ef..fd59915929d2e0908e536345767d11477fbcb60b 100644
--- a/tapeserver/daemon/TapedConfigurationTests.cpp
+++ b/tapeserver/daemon/TapedConfigurationTests.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/TapedProxy.cpp b/tapeserver/daemon/TapedProxy.cpp
index b6dd790d7a8cd00297bf448fb7de3cd16285d3bb..020ac63bd7f34cbc4f0854fbf43fc7c736768853 100644
--- a/tapeserver/daemon/TapedProxy.cpp
+++ b/tapeserver/daemon/TapedProxy.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/TapedProxy.hpp b/tapeserver/daemon/TapedProxy.hpp
index bdcb93c4d56f5600edd0fdd269ce3e21e1dd3da5..2c5596073806a5b9eb2079b8b3f97ae16f79181c 100644
--- a/tapeserver/daemon/TapedProxy.hpp
+++ b/tapeserver/daemon/TapedProxy.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/TestSubprocessHandlers.hpp b/tapeserver/daemon/TestSubprocessHandlers.hpp
index 6bf89e90fb697e86b7e0875c316976840cf715ba..9ac76b5cde48f5a810a6971bf53184042fac6b29 100644
--- a/tapeserver/daemon/TestSubprocessHandlers.hpp
+++ b/tapeserver/daemon/TestSubprocessHandlers.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/Tpconfig.cpp b/tapeserver/daemon/Tpconfig.cpp
index d85644fd2fc5bd7523c37cdb5a4a9ce65fff8ff3..e3ffd9bda8f1c48f5cfa38a58ca6da7ba0887e7b 100644
--- a/tapeserver/daemon/Tpconfig.cpp
+++ b/tapeserver/daemon/Tpconfig.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/Tpconfig.hpp b/tapeserver/daemon/Tpconfig.hpp
index d372813e8c48f110657841a9c21ab64864a36c21..2d0ee4d640c65cf5a2415c0fbd5ae0b5632e90c7 100644
--- a/tapeserver/daemon/Tpconfig.hpp
+++ b/tapeserver/daemon/Tpconfig.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/TpconfigLine.cpp b/tapeserver/daemon/TpconfigLine.cpp
index 684bc26907c8f533a1ac624004f2fd24610d3391..f60f5cecb9cdd2200c4a6a796a8b61de6baaa0e2 100644
--- a/tapeserver/daemon/TpconfigLine.cpp
+++ b/tapeserver/daemon/TpconfigLine.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/TpconfigLine.hpp b/tapeserver/daemon/TpconfigLine.hpp
index fcdca50c4744a94eacbd2e5c02e09beff97a07ad..f62a7a916c51b2543d119090ccb42416de63b32a 100644
--- a/tapeserver/daemon/TpconfigLine.hpp
+++ b/tapeserver/daemon/TpconfigLine.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/daemon/TpconfigTests.cpp b/tapeserver/daemon/TpconfigTests.cpp
index 0cd281601c3612cef5545d68209f32dfb8242bb0..3665ed7396aa4db7e07bed133e51423824761626 100644
--- a/tapeserver/daemon/TpconfigTests.cpp
+++ b/tapeserver/daemon/TpconfigTests.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/session/SessionState.cpp b/tapeserver/session/SessionState.cpp
index 34d8a8c0586970f457eda32279d938502852d819..a3f349f899a42f851129f0fd7026e606a32bd886 100644
--- a/tapeserver/session/SessionState.cpp
+++ b/tapeserver/session/SessionState.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/session/SessionState.hpp b/tapeserver/session/SessionState.hpp
index b7daa7acfc925be9e05c616ff02c568b22c6aa92..9ca44e562cab73be791aa2a475c29dac736e8734 100644
--- a/tapeserver/session/SessionState.hpp
+++ b/tapeserver/session/SessionState.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/session/SessionType.cpp b/tapeserver/session/SessionType.cpp
index 4c5830ed3ac082d54fb425b855b3938b5fe0adb8..f4b4a99e30243683dbbf0816193201abee853797 100644
--- a/tapeserver/session/SessionType.cpp
+++ b/tapeserver/session/SessionType.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/session/SessionType.hpp b/tapeserver/session/SessionType.hpp
index 2485f0e66524de2ba0fe0500d38cb1041b3dbb7c..4f1a499ea19a105eeb121def3bb3c48927a457cf 100644
--- a/tapeserver/session/SessionType.hpp
+++ b/tapeserver/session/SessionType.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/tapelabel/CmdLineTool.cpp b/tapeserver/tapelabel/CmdLineTool.cpp
index 22f0da5e62b38b9ac927cd45b2b7525c5e925a2f..7ab22c994f1b48f6879bc67f82322d479eb24b89 100644
--- a/tapeserver/tapelabel/CmdLineTool.cpp
+++ b/tapeserver/tapelabel/CmdLineTool.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/tapelabel/CmdLineTool.hpp b/tapeserver/tapelabel/CmdLineTool.hpp
index e68ea2c0d42ea3cd9ed069a482f04bb85ac32e69..40c50a693ac7f59880a0809ff9d5a05f4fd16d2e 100644
--- a/tapeserver/tapelabel/CmdLineTool.hpp
+++ b/tapeserver/tapelabel/CmdLineTool.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/tapelabel/TapeLabelCmd.cpp b/tapeserver/tapelabel/TapeLabelCmd.cpp
index f589a86e019a87097ec88af61ee3cb7b4a93c78b..ac7645cb05cacfc4cfee6a3b09acc75fc187bfdb 100644
--- a/tapeserver/tapelabel/TapeLabelCmd.cpp
+++ b/tapeserver/tapelabel/TapeLabelCmd.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/tapelabel/TapeLabelCmd.hpp b/tapeserver/tapelabel/TapeLabelCmd.hpp
index 6fc055fdce9ac9099aad4e1a5608c2a229a13579..1a6130fe810b77b54c87b820b3d71767a33c89ae 100644
--- a/tapeserver/tapelabel/TapeLabelCmd.hpp
+++ b/tapeserver/tapelabel/TapeLabelCmd.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/tapelabel/TapeLabelCmdLineArgs.cpp b/tapeserver/tapelabel/TapeLabelCmdLineArgs.cpp
index 284f717bd660d5982d7b57d8d1952d65ea9ee69a..9d7f43bbcb77d049261c3356c61586a24d085883 100644
--- a/tapeserver/tapelabel/TapeLabelCmdLineArgs.cpp
+++ b/tapeserver/tapelabel/TapeLabelCmdLineArgs.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/tapelabel/TapeLabelCmdLineArgs.hpp b/tapeserver/tapelabel/TapeLabelCmdLineArgs.hpp
index 988f11a065b976d0245b68e97079d8c2df675fe5..4cbe92f15981762782cfa278bdc3bcf14cbb4ebd 100644
--- a/tapeserver/tapelabel/TapeLabelCmdLineArgs.hpp
+++ b/tapeserver/tapelabel/TapeLabelCmdLineArgs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/tapelabel/TapeLabelCmdLineArgsTest.cpp b/tapeserver/tapelabel/TapeLabelCmdLineArgsTest.cpp
index 9283dd25b716223a0c8f6c9e7bc8ee11a0ee6c1f..88b5b93742f230726d8acb78e7cced396e954167 100644
--- a/tapeserver/tapelabel/TapeLabelCmdLineArgsTest.cpp
+++ b/tapeserver/tapelabel/TapeLabelCmdLineArgsTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tapeserver/tapelabel/TapeLabelCmdMain.cpp b/tapeserver/tapelabel/TapeLabelCmdMain.cpp
index 1f3552f8aafed7950aaa88e842087601ed91e6d1..97bf7643fff112f61e6ea1ec45da0a42c85a8a5d 100644
--- a/tapeserver/tapelabel/TapeLabelCmdMain.cpp
+++ b/tapeserver/tapelabel/TapeLabelCmdMain.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tests/GlobalCatalogueFactoryForUnitTests.cpp b/tests/GlobalCatalogueFactoryForUnitTests.cpp
index cfe913546b6555d6691dc60c4cc291f6d02070da..5a5fd8d55b884e015d51f1b20e22b75c0aa96ff0 100644
--- a/tests/GlobalCatalogueFactoryForUnitTests.cpp
+++ b/tests/GlobalCatalogueFactoryForUnitTests.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tests/GlobalCatalogueFactoryForUnitTests.hpp b/tests/GlobalCatalogueFactoryForUnitTests.hpp
index 213ba2886b9d52c69caf84a0007f73b25a76f885..9699a1bfe42f130eca94a8d3ba097f5f41e745a0 100644
--- a/tests/GlobalCatalogueFactoryForUnitTests.hpp
+++ b/tests/GlobalCatalogueFactoryForUnitTests.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tests/ImmutableFileTest.cpp b/tests/ImmutableFileTest.cpp
index dbea7607ce165a1b016c5398f8a198cadeab261a..69b7d2a2c9142a383bd6266a29efe3e25f3b4969 100644
--- a/tests/ImmutableFileTest.cpp
+++ b/tests/ImmutableFileTest.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tests/ImmutableFileTest.hpp b/tests/ImmutableFileTest.hpp
index 8977af8fb5012b5bdeb8abb8c7e71efbd9a6dbe3..d8e41409193cdc3e6cff6ae7683d8f26a6103e58 100644
--- a/tests/ImmutableFileTest.hpp
+++ b/tests/ImmutableFileTest.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tests/ImmutableFileTestCmdLineArgs.cpp b/tests/ImmutableFileTestCmdLineArgs.cpp
index 25363aefd1add153d3564b94a73e235544be8ecd..aa5bf8ed049587f89ad4498cd242539ef22e1ef4 100644
--- a/tests/ImmutableFileTestCmdLineArgs.cpp
+++ b/tests/ImmutableFileTestCmdLineArgs.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tests/ImmutableFileTestCmdLineArgs.hpp b/tests/ImmutableFileTestCmdLineArgs.hpp
index 37913c2e0d7f9bf95e9b55225afb40950203a75b..accb813dc53786584395105d6cfcc647b1ec4427 100644
--- a/tests/ImmutableFileTestCmdLineArgs.hpp
+++ b/tests/ImmutableFileTestCmdLineArgs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tests/ImmutableFileTestMain.cpp b/tests/ImmutableFileTestMain.cpp
index 7bbea349e3e0baf6eba9d3657572b1ea5968085c..83cc00062629865e97aca52b2512a54594388009 100644
--- a/tests/ImmutableFileTestMain.cpp
+++ b/tests/ImmutableFileTestMain.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tests/RdbmsUnitTestsCmdLineArgs.cpp b/tests/RdbmsUnitTestsCmdLineArgs.cpp
index 52bb8311811ab786a4ed32f6088faddb293f858b..9d2a6b9deaa7a8cee7fdffbfd27b07078686c6f5 100644
--- a/tests/RdbmsUnitTestsCmdLineArgs.cpp
+++ b/tests/RdbmsUnitTestsCmdLineArgs.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tests/RdbmsUnitTestsCmdLineArgs.hpp b/tests/RdbmsUnitTestsCmdLineArgs.hpp
index 0d7d1c4d6a598f745d38dce471ba96e57e7aa2e5..4649f8a48c3a10a4dfea91926b27f77b008e43ec 100644
--- a/tests/RdbmsUnitTestsCmdLineArgs.hpp
+++ b/tests/RdbmsUnitTestsCmdLineArgs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tests/SubprocessSystemTests.cpp b/tests/SubprocessSystemTests.cpp
index 678ba0ac574176989ef0c48d335189134bb5a2c8..946490a716721e28c1cde8f901b333aa08da000b 100644
--- a/tests/SubprocessSystemTests.cpp
+++ b/tests/SubprocessSystemTests.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tests/TempDirectory.cpp b/tests/TempDirectory.cpp
index 169acf68c6c10657025639770f98dd178749967e..edf1c75c0e7b66647e0967ccfe9694929033c342 100644
--- a/tests/TempDirectory.cpp
+++ b/tests/TempDirectory.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tests/TempDirectory.hpp b/tests/TempDirectory.hpp
index 18f85af790563a201dbd680fa48ee8ab90120f25..2f18076a3e8b7f7ab02cb8fc002bf33e2531ec3f 100644
--- a/tests/TempDirectory.hpp
+++ b/tests/TempDirectory.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tests/TempFile.cpp b/tests/TempFile.cpp
index 28dbb8a86fe25b3f6b2dbe86d0e33abaa63be61f..379d6224503023756a3441cf2dd8a77489a27e4c 100644
--- a/tests/TempFile.cpp
+++ b/tests/TempFile.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tests/TempFile.hpp b/tests/TempFile.hpp
index ec9421032e7d369e0a5ec6870b538192b734661b..722a20b824ae6c229eae41af24cb029be80c9207 100644
--- a/tests/TempFile.hpp
+++ b/tests/TempFile.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tests/TestsCompileTimeSwitches.hpp b/tests/TestsCompileTimeSwitches.hpp
index 28f00dfcf0bf444a225c1dda4f0ed3f1824446b5..48354dfbe28f00a754025acf0ea69cfb95b6ca11 100644
--- a/tests/TestsCompileTimeSwitches.hpp
+++ b/tests/TestsCompileTimeSwitches.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tests/rdbmsUnitTests.cpp b/tests/rdbmsUnitTests.cpp
index f5854f744c4d9aff4423016ed54ec3648ddff830..c0c2acbc05c8d9c36cc42b229f7264e960eca45a 100644
--- a/tests/rdbmsUnitTests.cpp
+++ b/tests/rdbmsUnitTests.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tests/system_tests.cpp b/tests/system_tests.cpp
index 7af40e1cd7eee8e80a9d934c12e18add6a868e42..fce81c503b9c96c7723ca38c389fad540c40e183 100644
--- a/tests/system_tests.cpp
+++ b/tests/system_tests.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/tests/unit_tests.cpp b/tests/unit_tests.cpp
index f6ad3a7d839386004704bad91518fef6b41ca419..0694e61ea4383f31a7144037340c664550ad5494 100644
--- a/tests/unit_tests.cpp
+++ b/tests/unit_tests.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/version.hpp.in b/version.hpp.in
index c749a3392b2f25bd5be537eb7ca9ee70e50aac87..4f7a2d5312a6001d581d0aefc55eaa20433c5f77 100644
--- a/version.hpp.in
+++ b/version.hpp.in
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/GrpcClient.cpp b/xroot_plugins/GrpcClient.cpp
index 3dd44b4d8339fb30f023cd2958b44058c5b7beb5..8db78a59c533de4edf0ef0e898541684c61c53ce 100644
--- a/xroot_plugins/GrpcClient.cpp
+++ b/xroot_plugins/GrpcClient.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/GrpcClient.hpp b/xroot_plugins/GrpcClient.hpp
index 553efe055265769a2dacfcb697a4ffbf05b10917..74cce6c5c21fe5ee65d6ceb1186ee20158cb8cc9 100644
--- a/xroot_plugins/GrpcClient.hpp
+++ b/xroot_plugins/GrpcClient.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/GrpcEndpoint.cpp b/xroot_plugins/GrpcEndpoint.cpp
index 0f0531ec71055e53990d7e6bb3bea4cd98bc6ab0..9af339092a011b5b14248ac7bf10dc808f77a117 100644
--- a/xroot_plugins/GrpcEndpoint.cpp
+++ b/xroot_plugins/GrpcEndpoint.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/GrpcEndpoint.hpp b/xroot_plugins/GrpcEndpoint.hpp
index d7a33c31f8cf5827117fc4aca4319b0cc133040e..c95d12eb3644a600239fbb7c068db6ecd9ddb113 100644
--- a/xroot_plugins/GrpcEndpoint.hpp
+++ b/xroot_plugins/GrpcEndpoint.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/Namespace.hpp b/xroot_plugins/Namespace.hpp
index 0e9ecd535bf195cd2232325e0d45eb152c0222d9..142ccf0d30495369aa470731b4b92f9643d8832d 100644
--- a/xroot_plugins/Namespace.hpp
+++ b/xroot_plugins/Namespace.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/Versions.hpp b/xroot_plugins/Versions.hpp
index caaceaa8424c6c9849c4863932cedcae3db83608..ab9339c38b8e8f5792c7fd42187ac3d1e910e159 100644
--- a/xroot_plugins/Versions.hpp
+++ b/xroot_plugins/Versions.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/XrdCtaAdminLs.hpp b/xroot_plugins/XrdCtaAdminLs.hpp
index 35abce092799fb4fdcd28d2c9c6465207f0dc320..66abf9d9d361db89a5bc02201373031111d31561 100644
--- a/xroot_plugins/XrdCtaAdminLs.hpp
+++ b/xroot_plugins/XrdCtaAdminLs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/XrdCtaArchiveRouteLs.hpp b/xroot_plugins/XrdCtaArchiveRouteLs.hpp
index 87528bbc7de9d0d23cea6aa444c107e1a4cbdb36..4b993e8cb6d0fb52e08387b78b878ff74c6904a3 100644
--- a/xroot_plugins/XrdCtaArchiveRouteLs.hpp
+++ b/xroot_plugins/XrdCtaArchiveRouteLs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/XrdCtaDiskSystemLs.hpp b/xroot_plugins/XrdCtaDiskSystemLs.hpp
index d3015ff6206b66c879061d8bc16dce6a80ce4d76..b1eedcdb030deb17d9f6afb98c6136e88078ea61 100644
--- a/xroot_plugins/XrdCtaDiskSystemLs.hpp
+++ b/xroot_plugins/XrdCtaDiskSystemLs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/XrdCtaDriveLs.hpp b/xroot_plugins/XrdCtaDriveLs.hpp
index 6362f60ff3adf95c51691c535a79544ce937bd00..b470fd45dcf0c6c5de7807651544140e8e9af5a6 100644
--- a/xroot_plugins/XrdCtaDriveLs.hpp
+++ b/xroot_plugins/XrdCtaDriveLs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -56,6 +56,8 @@ private:
    */
   virtual int fillBuffer(XrdSsiPb::OStreamBuffer<Data> *streambuf);
 
+  cta::log::LogContext m_lc;
+
   static constexpr const char* const LOG_SUFFIX  = "DriveLsStream";    //!< Identifier for log messages
 
   std::list<std::string> m_tapeDriveNames;
@@ -65,7 +67,8 @@ private:
 DriveLsStream::DriveLsStream(const RequestMessage &requestMsg, cta::catalogue::Catalogue &catalogue,
   cta::Scheduler &scheduler, const cta::common::dataStructures::SecurityIdentity &clientID,
   log::LogContext &lc) :
-  XrdCtaStream(catalogue, scheduler) {
+  XrdCtaStream(catalogue, scheduler),
+  m_lc(lc) {
   using namespace cta::admin;
 
   m_tapeDriveNames = m_catalogue.getTapeDriveNames();
@@ -115,12 +118,15 @@ int DriveLsStream::fillBuffer(XrdSsiPb::OStreamBuffer<Data> *streambuf) {
     dr_item->set_desired_drive_state(dr.desiredUp ? DriveLsItem::UP : DriveLsItem::DOWN);
     dr_item->set_mount_type(MountTypeToProtobuf(dr.mountType));
     dr_item->set_drive_status(DriveStatusToProtobuf(dr.driveStatus));
-    dr_item->set_vid(dr.currentVid ? dr.currentVid.value() : 0);
+    dr_item->set_vid(dr.currentVid ? dr.currentVid.value() : "");
     dr_item->set_tapepool(dr.currentTapePool ? dr.currentTapePool.value() : "");
     dr_item->set_vo(dr.currentVo ? dr.currentVo.value() : "");
     dr_item->set_files_transferred_in_session(dr.filesTransferedInSession ? dr.filesTransferedInSession.value() : 0);
     dr_item->set_bytes_transferred_in_session(dr.bytesTransferedInSession ? dr.bytesTransferedInSession.value() : 0);
-    dr_item->set_latest_bandwidth(dr.latestBandwidth ? std::stoi(dr.latestBandwidth.value()) : 0);
+    if (dr.latestBandwidth && std::isdigit(dr.latestBandwidth.value().at(0)))
+      dr_item->set_latest_bandwidth(std::stoi(dr.latestBandwidth.value()));
+    else
+      dr_item->set_latest_bandwidth(0);
     dr_item->set_session_id(dr.sessionId ? dr.sessionId.value() : 0);
     const auto lastUpdateTime = dr.lastModificationLog ? dr.lastModificationLog.value().time : 0;
     dr_item->set_time_since_last_update(time(nullptr) - lastUpdateTime);
diff --git a/xroot_plugins/XrdCtaFailedRequestLs.hpp b/xroot_plugins/XrdCtaFailedRequestLs.hpp
index 265cfc1e404a4cb453e60aff09badf15f901108c..98a4981850ee5ef6415b97682ab8e01a088eabdb 100644
--- a/xroot_plugins/XrdCtaFailedRequestLs.hpp
+++ b/xroot_plugins/XrdCtaFailedRequestLs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/XrdCtaGroupMountRuleLs.hpp b/xroot_plugins/XrdCtaGroupMountRuleLs.hpp
index 1e3992fbe2f089d4ab584d22db084da10fdd9b16..3b05c83cfefa1280f833fdb689c96f879a9ec676 100644
--- a/xroot_plugins/XrdCtaGroupMountRuleLs.hpp
+++ b/xroot_plugins/XrdCtaGroupMountRuleLs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/XrdCtaLogicalLibraryLs.hpp b/xroot_plugins/XrdCtaLogicalLibraryLs.hpp
index fe5126670fb231bee993a5b6580fabe24687ddc1..a8e2d8ee4d40c1bfc57251675055ed86d18ce72b 100644
--- a/xroot_plugins/XrdCtaLogicalLibraryLs.hpp
+++ b/xroot_plugins/XrdCtaLogicalLibraryLs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/XrdCtaMediaTypeLs.hpp b/xroot_plugins/XrdCtaMediaTypeLs.hpp
index c7a0019065299d2f8cb94e67d9fa6f972d89db4e..64aa75a254ce766e4c9ce882370dc8eef657b791 100644
--- a/xroot_plugins/XrdCtaMediaTypeLs.hpp
+++ b/xroot_plugins/XrdCtaMediaTypeLs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/XrdCtaMountPolicyLs.hpp b/xroot_plugins/XrdCtaMountPolicyLs.hpp
index e74257abf46d41c0d248c17a3ae451f6d56a0ddf..22a073dcab59c0052230568b95ea71101f07968b 100644
--- a/xroot_plugins/XrdCtaMountPolicyLs.hpp
+++ b/xroot_plugins/XrdCtaMountPolicyLs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/XrdCtaRecycleTapeFileLs.hpp b/xroot_plugins/XrdCtaRecycleTapeFileLs.hpp
index 1b8442aa87d22253eca6b93a0818ed151f6bd0c7..7c18034dd8eadefad9f2c83c39860beb5237ab7b 100644
--- a/xroot_plugins/XrdCtaRecycleTapeFileLs.hpp
+++ b/xroot_plugins/XrdCtaRecycleTapeFileLs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/XrdCtaRepackLs.hpp b/xroot_plugins/XrdCtaRepackLs.hpp
index 7f645ca2766c150c952fb844cf52746247ac072a..bf09aef5537652eaa8fb358dc3e6b9d9d023055a 100644
--- a/xroot_plugins/XrdCtaRepackLs.hpp
+++ b/xroot_plugins/XrdCtaRepackLs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -30,8 +30,8 @@ namespace cta { namespace xrd {
   class RepackLsStream: public XrdSsiStream {
   public:
     
-    RepackLsStream(cta::Scheduler& scheduler, const cta::optional<std::string> vid):
-    XrdSsiStream(XrdSsiStream::isActive),m_scheduler(scheduler), m_vid(vid){
+    RepackLsStream(cta::Scheduler& scheduler, cta::catalogue::Catalogue& catalogue, const cta::optional<std::string> vid):
+    XrdSsiStream(XrdSsiStream::isActive),m_scheduler(scheduler), m_catalogue(catalogue), m_vid(vid) {
       XrdSsiPb::Log::Msg(XrdSsiPb::Log::DEBUG, LOG_SUFFIX, "RepackLsStream() constructor");
       if(!vid){
         m_repackList = m_scheduler.getRepacks();
@@ -59,7 +59,14 @@ namespace cta { namespace xrd {
 	  last = true;
 	  return nullptr;
 	}
-	
+
+	std::set<std::string> tapeVids;
+	std::transform(m_repackList.begin(), m_repackList.end(),
+                 std::inserter(tapeVids, tapeVids.begin()),
+                 [](cta::common::dataStructures::RepackInfo &ri) {return ri.vid;});
+
+	cta::common::dataStructures::VidToTapeMap tapeVidMap = m_catalogue.getTapesByVid(tapeVids); // throws an exception if a vid does not exist
+
 	streambuf = new XrdSsiPb::OStreamBuffer<Data>(dlen);
 	
 	for(bool is_buffer_full = false; !m_repackList.empty() && !is_buffer_full; m_repackList.pop_front()){
@@ -73,6 +80,7 @@ namespace cta { namespace xrd {
     
 	  auto repackRequestItem = record.mutable_rels_item();
 	  repackRequestItem->set_vid(repackRequest.vid);
+	  repackRequestItem->set_tapepool(tapeVidMap[repackRequest.vid].tapePoolName);
 	  repackRequestItem->set_repack_buffer_url(repackRequest.repackBufferBaseURL);
 	  repackRequestItem->set_user_provided_files(repackRequest.userProvidedFiles);
 	  repackRequestItem->set_total_files_to_retrieve(totalFilesToRetrieve);
@@ -137,6 +145,7 @@ namespace cta { namespace xrd {
   
   private:
     cta::Scheduler &m_scheduler;
+    cta::catalogue::Catalogue &m_catalogue;
     const cta::optional<std::string> m_vid;
     std::list<common::dataStructures::RepackInfo> m_repackList;
     static constexpr const char * const LOG_SUFFIX = "RepackLsStream";
diff --git a/xroot_plugins/XrdCtaRequesterMountRuleLs.hpp b/xroot_plugins/XrdCtaRequesterMountRuleLs.hpp
index 2b2307593c5fe44723b519d584cb7fe9c459a270..455600f669bd8d0f2620231391b8b0f0cdb9bfc0 100644
--- a/xroot_plugins/XrdCtaRequesterMountRuleLs.hpp
+++ b/xroot_plugins/XrdCtaRequesterMountRuleLs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/XrdCtaSchedulingInfosLs.hpp b/xroot_plugins/XrdCtaSchedulingInfosLs.hpp
index 32faeef2dd7ea24baeeaee2b3b57f81287a3dcdd..15e8d479d1a4ab5205b47dce6235c75c77d3af13 100644
--- a/xroot_plugins/XrdCtaSchedulingInfosLs.hpp
+++ b/xroot_plugins/XrdCtaSchedulingInfosLs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/XrdCtaShowQueues.hpp b/xroot_plugins/XrdCtaShowQueues.hpp
index 4e6281f1806444c83af7d8822aa422047c8cd199..98223be9c0e12ca89fa11de4e917a9ffd6fb4ef7 100644
--- a/xroot_plugins/XrdCtaShowQueues.hpp
+++ b/xroot_plugins/XrdCtaShowQueues.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/XrdCtaStorageClassLs.hpp b/xroot_plugins/XrdCtaStorageClassLs.hpp
index eef070d75c166007a771760b73f540e44354b813..9d5f141f83b860be6f4097ba3baaa2ec86dc37c3 100644
--- a/xroot_plugins/XrdCtaStorageClassLs.hpp
+++ b/xroot_plugins/XrdCtaStorageClassLs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/XrdCtaStream.hpp b/xroot_plugins/XrdCtaStream.hpp
index 91e1904385f2398e5990fbbd70af6be348df448e..10bc82c3c087be8002082408b18ec8885fb82ee2 100644
--- a/xroot_plugins/XrdCtaStream.hpp
+++ b/xroot_plugins/XrdCtaStream.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/XrdCtaTapeFileLs.hpp b/xroot_plugins/XrdCtaTapeFileLs.hpp
index 032d265afaf98471f66215ac4ef592ddd436fea5..a90582ebfa3419cea7e735ed6071fdce597063ca 100644
--- a/xroot_plugins/XrdCtaTapeFileLs.hpp
+++ b/xroot_plugins/XrdCtaTapeFileLs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/XrdCtaTapeLs.hpp b/xroot_plugins/XrdCtaTapeLs.hpp
index b834784a0384c06ed8b158aac689c81d87f14150..a6e48eeec3c4ea8b74f13e14bb59b74486230977 100644
--- a/xroot_plugins/XrdCtaTapeLs.hpp
+++ b/xroot_plugins/XrdCtaTapeLs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -70,6 +70,7 @@ TapeLsStream::TapeLsStream(const RequestMessage &requestMsg, cta::catalogue::Cat
   // Get the search criteria from the optional options
 
   searchCriteria.full            = requestMsg.getOptional(OptionBoolean::FULL,           &has_any);
+  searchCriteria.fromCastor      = requestMsg.getOptional(OptionBoolean::FROM_CASTOR,    &has_any);
   searchCriteria.capacityInBytes = requestMsg.getOptional(OptionUInt64::CAPACITY,        &has_any);
   searchCriteria.logicalLibrary  = requestMsg.getOptional(OptionString::LOGICAL_LIBRARY, &has_any);
   searchCriteria.tapePool        = requestMsg.getOptional(OptionString::TAPE_POOL,       &has_any);
diff --git a/xroot_plugins/XrdCtaTapePoolLs.hpp b/xroot_plugins/XrdCtaTapePoolLs.hpp
index f49003d0f7c895300406649cd30964f87aeb74b1..ed8f57715a233c249dc62bb17ea40403997585fe 100644
--- a/xroot_plugins/XrdCtaTapePoolLs.hpp
+++ b/xroot_plugins/XrdCtaTapePoolLs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -19,6 +19,7 @@
 
 #include <xroot_plugins/XrdCtaStream.hpp>
 #include <xroot_plugins/XrdSsiCtaRequestMessage.hpp>
+#include <catalogue/TapePoolSearchCriteria.hpp>
 
 
 namespace cta { namespace xrd {
@@ -63,6 +64,13 @@ TapePoolLsStream::TapePoolLsStream(const RequestMessage &requestMsg, cta::catalo
   using namespace cta::admin;
 
   XrdSsiPb::Log::Msg(XrdSsiPb::Log::DEBUG, LOG_SUFFIX, "TapePoolLsStream() constructor");
+  cta::catalogue::TapePoolSearchCriteria searchCriteria;
+
+  searchCriteria.name = requestMsg.getOptional(OptionString_Key_TAPE_POOL);
+  searchCriteria.vo = requestMsg.getOptional(OptionString_Key_VO);
+  searchCriteria.encrypted = requestMsg.getOptional(OptionBoolean_Key_ENCRYPTED);
+
+  m_tapePoolList = m_catalogue.getTapePools(searchCriteria);
 }
 
 int TapePoolLsStream::fillBuffer(XrdSsiPb::OStreamBuffer<Data> *streambuf) {
diff --git a/xroot_plugins/XrdCtaVersion.hpp b/xroot_plugins/XrdCtaVersion.hpp
index 2e7064caa5fc51abb98a9cf69e82ee2e0c90f780..853a8a6cc231bbdb0917589137ba378c61b4e9a2 100644
--- a/xroot_plugins/XrdCtaVersion.hpp
+++ b/xroot_plugins/XrdCtaVersion.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/XrdCtaVirtualOrganizationLs.hpp b/xroot_plugins/XrdCtaVirtualOrganizationLs.hpp
index 2779c4fc93b7855684c4d5988eea3677cf200d69..8bf8e52bb97af9fba5d58e813a8fa71e5188b8ff 100644
--- a/xroot_plugins/XrdCtaVirtualOrganizationLs.hpp
+++ b/xroot_plugins/XrdCtaVirtualOrganizationLs.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/XrdSsiCtaRequestMessage.cpp b/xroot_plugins/XrdSsiCtaRequestMessage.cpp
index 0743ca225d41032a92ca4f98a686473122dc2f91..2d4ce1880bcdd6c141e182fe05f028bc49791db8 100644
--- a/xroot_plugins/XrdSsiCtaRequestMessage.cpp
+++ b/xroot_plugins/XrdSsiCtaRequestMessage.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
@@ -48,11 +48,6 @@ using XrdSsiPb::PbException;
 namespace cta {
 namespace xrd {
 
-// Codes to change colours for console output (when sending a response to cta-admin)
-const char* const TEXT_RED    = "\x1b[31;1m";
-const char* const TEXT_NORMAL = "\x1b[0m\n";
-
-
 /*
  * Convert AdminCmd <Cmd, SubCmd> pair to an integer so that it can be used in a switch statement
  */
@@ -276,13 +271,14 @@ void RequestMessage::process(const cta::xrd::Request &request, cta::xrd::Respons
                processVirtualOrganization_Ls(response, stream);
                break;
            case cmd_pair(AdminCmd::CMD_VERSION, AdminCmd::SUBCMD_NONE):
-             processVersion(response, stream);
-             break;
+               processVersion(response, stream);
+               break;
            case cmd_pair(AdminCmd::CMD_SCHEDULINGINFOS, AdminCmd::SUBCMD_LS):
-             processSchedulingInfos_Ls(response,stream);
+               processSchedulingInfos_Ls(response,stream);
+               break;
            case cmd_pair(AdminCmd::CMD_RECYCLETAPEFILE, AdminCmd::SUBCMD_LS):
-             processRecycleTapeFile_Ls(response,stream);
-             break;
+               processRecycleTapeFile_Ls(response,stream);
+               break;
             default:
                throw PbException("Admin command pair <" +
                      AdminCmd_Cmd_Name(request.admincmd().cmd()) + ", " +
@@ -1500,7 +1496,7 @@ void RequestMessage::processRepack_Ls(cta::xrd::Response &response, XrdSsiStream
   auto vid = getOptional(OptionString::VID);
 
   // Create a XrdSsi stream object to return the results
-  stream = new RepackLsStream(m_scheduler, vid);
+  stream = new RepackLsStream(m_scheduler, m_catalogue, vid);
 
   response.set_show_header(HeaderType::REPACK_LS);
   response.set_type(cta::xrd::Response::RSP_SUCCESS);
diff --git a/xroot_plugins/XrdSsiCtaRequestMessage.hpp b/xroot_plugins/XrdSsiCtaRequestMessage.hpp
index 1d0f6222192f51dc366e43327229eea2fc1eb320..24bf193b2872f6bb74bf26c0636b7dd15cdf9de5 100644
--- a/xroot_plugins/XrdSsiCtaRequestMessage.hpp
+++ b/xroot_plugins/XrdSsiCtaRequestMessage.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/XrdSsiCtaRequestProc.cpp b/xroot_plugins/XrdSsiCtaRequestProc.cpp
index fd5ea720c572e30e40fec54c1db9ef677f412a15..6318b031c7adf2f256a29f3de04c9e3937fd2b0b 100644
--- a/xroot_plugins/XrdSsiCtaRequestProc.cpp
+++ b/xroot_plugins/XrdSsiCtaRequestProc.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/XrdSsiCtaServiceProvider.cpp b/xroot_plugins/XrdSsiCtaServiceProvider.cpp
index d7bad785fdcd1c775d55e855e921d254fde6e04f..df4cc19b2cffb7033735d7b3c9a3f6ddab3c2d02 100644
--- a/xroot_plugins/XrdSsiCtaServiceProvider.cpp
+++ b/xroot_plugins/XrdSsiCtaServiceProvider.cpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xroot_plugins/XrdSsiCtaServiceProvider.hpp b/xroot_plugins/XrdSsiCtaServiceProvider.hpp
index 8ef9a0379be63ddbd7ff8da6f93c4999eba2b5aa..43aacb27b8c5b795a9fe1fcbfbac05fb647782e1 100644
--- a/xroot_plugins/XrdSsiCtaServiceProvider.hpp
+++ b/xroot_plugins/XrdSsiCtaServiceProvider.hpp
@@ -1,6 +1,6 @@
 /*
  * @project        The CERN Tape Archive (CTA)
- * @copyright      Copyright(C) 2021 CERN
+ * @copyright      Copyright(C) 2015-2021 CERN
  * @license        This program is free software: you can redistribute it and/or modify
  *                 it under the terms of the GNU General Public License as published by
  *                 the Free Software Foundation, either version 3 of the License, or
diff --git a/xrootd-ssi-protobuf-interface b/xrootd-ssi-protobuf-interface
index ef1e4d7a679b8f60e48a6aa0f25e09c5851c2abc..2f8068955f6622f26e6373a70cfcb4f16435d7ea 160000
--- a/xrootd-ssi-protobuf-interface
+++ b/xrootd-ssi-protobuf-interface
@@ -1 +1 @@
-Subproject commit ef1e4d7a679b8f60e48a6aa0f25e09c5851c2abc
+Subproject commit 2f8068955f6622f26e6373a70cfcb4f16435d7ea