diff --git a/Database/IOVDbSvc/python/CondDB.py b/Database/IOVDbSvc/python/CondDB.py
index fc854f8f1c8b0b385d1f59127965445611024eb7..9dd4aebc60b7449e7135d2a67be33db2de67a881 100644
--- a/Database/IOVDbSvc/python/CondDB.py
+++ b/Database/IOVDbSvc/python/CondDB.py
@@ -267,7 +267,11 @@ This allows the possibility of later adding a new IOV using IOVSvc::setRange."""
             if (self.iovdbsvc.Folders[i].find(folder)>=0):
                 del self.iovdbsvc.Folders[i]
                 break
-            
+        for i in range(0, len(condInputLoader.Load)):
+            if (condInputLoader.Load[i][-1] == self.extractFolder(folder)):
+                del condInputLoader.Load[i]
+                break
+
     def folderRequested(self,folder):
         "Return true if the given folder has already been requested"
         for i in self.iovdbsvc.Folders:
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override.py
index 93b4df2d61bad269b57508eb81e05b2e5f5067f7..f7559a0b402d0f1c0b8b66e6c45fc4c6bdc956ed 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override.py
@@ -9,8 +9,8 @@ conddb.addFolderWithTag("TRT_OFL","/TRT/Calib/T0","TrtCalibT0-Physics-BLK-UPD4-F
 conddb.blockFolder("/MDT/RT")
 conddb.addFolderWithTag("MDT_OFL","/MDT/RT","MDTRT_Sim-00",force=True,forceMC=True)
 conddb.blockFolder("/MDT/RTBLOB")
-#conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT-UPD4-09-BLOB",force=True,forceData=True)
-conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-00-BLOB",force=True,forceMC=True)
+#conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT-UPD4-09-BLOB",force=True,forceData=True,className="CondAttrListCollection")
+conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-00-BLOB",force=True,forceMC=True,className="CondAttrListCollection")
 
 #can try using MC T0 constants, or force a data tag to use
 conddb.blockFolder("/MDT/T0")
@@ -25,7 +25,7 @@ conddb.addFolderWithTag("PIXEL_ONL","/PIXEL/HLT/DCS/HV","PixDCSHV-UPD1-00",force
 conddb.blockFolder("/PIXEL/HLT/DCS/TEMPERATURE")
 conddb.addFolderWithTag("PIXEL_ONL","/PIXEL/HLT/DCS/TEMPERATURE","PixDCSTemp-UPD1-00",force=True,forceData=True)
 conddb.blockFolder("/PIXEL/ReadoutSpeed")
-conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True)
+conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True,className="AthenaAttributeList")
 #conddb.addFolder("PIXEL_OFL","/PIXEL/ReadoutSpeed",force=True,forceData=True)
 
 #conddb.blockFolder("/GLOBAL/BField/Map")
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_BLKPA-006-05.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_BLKPA-006-05.py
index 8a0cc248cf7e95301c2a8f1c6fc921e88653f873..6211fc2ff880833cc291e428ab7b4e3849d42701 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_BLKPA-006-05.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_BLKPA-006-05.py
@@ -9,14 +9,14 @@ conddb.addFolderWithTag("TRT_OFL","/TRT/Calib/RT","TrtCalibRt-MCnewDigi_ToTon_7T
 conddb.blockFolder("/MDT/RT")
 conddb.addFolderWithTag("MDT_OFL","/MDT/RT","MDTRT_Sim-00",force=True,forceMC=True)
 conddb.blockFolder("/MDT/RTBLOB")
-conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-00-BLOB",force=True,forceMC=True)
+conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-00-BLOB",force=True,forceMC=True,className="CondAttrListCollection")
 
 conddb.blockFolder("/PIXEL/HLT/DCS/HV")
 conddb.addFolderWithTag("PIXEL_ONL","/PIXEL/HLT/DCS/HV","PixDCSHV-UPD1-00",force=True,forceData=True)
 conddb.blockFolder("/PIXEL/HLT/DCS/TEMPERATURE")
 conddb.addFolderWithTag("PIXEL_ONL","/PIXEL/HLT/DCS/TEMPERATURE","PixDCSTemp-UPD1-00",force=True,forceData=True)
 conddb.blockFolder("/PIXEL/ReadoutSpeed")
-conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True)
+conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True,className="AthenaAttributeList")
 
 conddb.blockFolder("/TRT/Cond/DigVers")
 conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions-01",force=True,forceMC=True,
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_BLKPA-006-11.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_BLKPA-006-11.py
index cb78a7e3d084fca5bc3ab52962a8e6d4bf5063ce..a1945ef1d8abbb150cefd1008d8545357d044ef7 100755
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_BLKPA-006-11.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_BLKPA-006-11.py
@@ -12,14 +12,14 @@ conddb.addFolderWithTag("TRT_OFL","/TRT/Calib/RT","TrtCalibRt-MCnewDigi_ToTon_7T
 #conddb.blockFolder("/MDT/RT")
 #conddb.addFolderWithTag("MDT_OFL","/MDT/RT","MDTRT_Sim-00",force=True,forceMC=True)
 #conddb.blockFolder("/MDT/RTBLOB")
-#conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-00-BLOB",force=True,forceMC=True)
+#conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-00-BLOB",force=True,forceMC=True,className="CondAttrListCollection")
 
 conddb.blockFolder("/PIXEL/HLT/DCS/HV")
 conddb.addFolderWithTag("PIXEL_ONL","/PIXEL/HLT/DCS/HV","PixDCSHV-UPD1-00",force=True,forceData=True)
 conddb.blockFolder("/PIXEL/HLT/DCS/TEMPERATURE")
 conddb.addFolderWithTag("PIXEL_ONL","/PIXEL/HLT/DCS/TEMPERATURE","PixDCSTemp-UPD1-00",force=True,forceData=True)
 conddb.blockFolder("/PIXEL/ReadoutSpeed")
-conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True)
+conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True,className="AthenaAttributeList")
 conddb.blockFolder("/PIXEL/PixReco")
 conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixReco","PixReco-SIM-RUN12-000-01",force=True,forceMC=True)
 
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_COMCOND-BLKPA-RUN1-08.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_COMCOND-BLKPA-RUN1-08.py
index 1f253cb14cb395d6c613cb7baa02d0720a35fdaa..aa6723b9d7c4e74c4b2099884691487981f01d65 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_COMCOND-BLKPA-RUN1-08.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_COMCOND-BLKPA-RUN1-08.py
@@ -13,7 +13,7 @@ from RecExConfig.RecAlgsFlags import recAlgs
 conddb.addOverride("/LAR/ElecCalibOfl/Shape/RTM/5samples1phase","LARElecCalibOflShapeRTM5samples1phase-UPD1-04")
 
 conddb.blockFolder("/PIXEL/ReadoutSpeed")
-conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True)
+conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True,className="AthenaAttributeList")
 
 conddb.blockFolder("/TRT/Cond/DigVers")
 conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions-01",force=True,forceMC=True,
@@ -74,7 +74,7 @@ conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/LorentzAngleScale","PixLorentzAngleS
 conddb.blockFolder("/PIXEL/DCS/TEMPERATURE")
 conddb.addFolderWithTag("DCS_OFL","/PIXEL/DCS/TEMPERATURE","PixDCSTemp-SIM-RUN1-000-00",force=True,forceMC=True)
 conddb.blockFolder("/PIXEL/PixdEdx")
-conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN1-000-02",force=True,forceMC=True)
+conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN1-000-02",force=True,forceMC=True,className="AthenaAttributeList")
 conddb.blockFolder("/SCT/DCS/HV")
 conddb.addFolderWithTag("DCS_OFL","/SCT/DCS/HV","SctDcsHv-01",force=True,forceMC=True)
 conddb.blockFolder("/SCT/DCS/MODTEMP")
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_CONDBR2-BLKPA-2015-12.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_CONDBR2-BLKPA-2015-12.py
index 8aff6fb2e8364b5f3235ceb3dfdfc161c15ebf00..07c9cfb66d52e1017a575ab17cc85758b1216730 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_CONDBR2-BLKPA-2015-12.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_CONDBR2-BLKPA-2015-12.py
@@ -7,7 +7,7 @@ from RecExConfig.RecAlgsFlags import recAlgs
 #conddb.blockFolder("/MDT/RT")
 #conddb.addFolderWithTag("MDT_OFL","/MDT/RT","MDTRT_Sim-04",force=True,forceMC=True)
 conddb.blockFolder("/MDT/RTBLOB")
-conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True)
+conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True,className="CondAttrListCollection")
 
 #from Guillaume
 conddb.blockFolder("/LAR/LArCellPositionShift");
@@ -17,7 +17,7 @@ conddb.addOverride("/LAR/ElecCalibOfl/OFC/PhysWave/RTM/4samples1phase","LARElecC
 svcMgr.PoolSvc.ReadCatalog+=["xmlcatalog_file:"+"/cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml"]
 
 conddb.blockFolder("/PIXEL/ReadoutSpeed")
-conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True)
+conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True,className="AthenaAttributeList")
 
 conddb.blockFolder("/TRT/Cond/DigVers")
 conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions-01",force=True,forceMC=True,
@@ -77,7 +77,7 @@ if DetFlags.writeRDOPool.pixel_on():
     conddb.addFolder("PIXEL_OFL","/PIXEL/PixReco")
 
 conddb.blockFolder("/PIXEL/PixdEdx")
-conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN1-000-02",force=True,forceMC=True)
+conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN1-000-02",force=True,forceMC=True,className="AthenaAttributeList")
 mcIDoverlay=False
 if mcIDoverlay:
     printfunc ("ACH777: Using MC overlay Lorentz DB settings")
@@ -123,16 +123,16 @@ conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEA","MuonAlignTGCEndC
 conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEC","MuonAlignTGCEndCapCAlign-0001-DEFAULT",force=True,forceMC=True,className='CondAttrListCollection')
 
 conddb.blockFolder("/SCT/DAQ/Config/Chip")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True)
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True,className="CondAttrListVec")
 conddb.blockFolder("/SCT/DAQ/Config/Module")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True)
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True,className="CondAttrListVec")
 
 conddb.blockFolder("/LAR/BadChannels/BadChannels")
 conddb.blockFolder("/LAR/BadChannelsOfl/BadChannels")
-conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/BadChannels","LARBadChannelsBadChannels-HECAQ3Missing",force=True,forceMC=True)
+conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/BadChannels","LARBadChannelsBadChannels-HECAQ3Missing",force=True,forceMC=True,className="CondAttrListCollection")
 conddb.blockFolder("/LAR/BadChannels/MissingFEBs")
 conddb.blockFolder("/LAR/BadChannelsOfl/MissingFEBs")
-conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True)
+conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True,className="AthenaAttributeList")
 
 dofolderoverrides = True
 if dofolderoverrides:
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC15c-SDR-11.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC15c-SDR-11.py
index 5b819a37b2c704664951a227fcf9eaf83a790b89..f0ebc6b652a01142121312a5e7e0d7a01164bcef 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC15c-SDR-11.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC15c-SDR-11.py
@@ -7,7 +7,7 @@ from RecExConfig.RecAlgsFlags import recAlgs
 #conddb.blockFolder("/MDT/RT")
 #conddb.addFolderWithTag("MDT_OFL","/MDT/RT","MDTRT_Sim-04",force=True,forceMC=True)
 conddb.blockFolder("/MDT/RTBLOB")
-conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True)
+conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True,className="CondAttrListCollection")
 
 #from Guillaume
 conddb.blockFolder("/LAR/LArCellPositionShift");
@@ -17,7 +17,7 @@ conddb.addOverride("/LAR/ElecCalibOfl/OFC/PhysWave/RTM/4samples1phase","LARElecC
 svcMgr.PoolSvc.ReadCatalog+=["xmlcatalog_file:"+"/cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml"]
 
 conddb.blockFolder("/PIXEL/ReadoutSpeed")
-conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True)
+conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True,className="AthenaAttributeList")
 
 conddb.blockFolder("/TRT/Cond/DigVers")
 conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions-01",force=True,forceMC=True,
@@ -80,7 +80,7 @@ if DetFlags.writeRDOPool.pixel_on():
     conddb.addFolder("PIXEL_OFL","/PIXEL/PixReco")
 
 conddb.blockFolder("/PIXEL/PixdEdx")
-conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True)
+conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True,className="AthenaAttributeList")
 mcIDoverlay=False
 if mcIDoverlay:
     printfunc ("ACH777: Using MC overlay Lorentz DB settings")
@@ -126,7 +126,7 @@ conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEA","MuonAlignTGCEndC
 conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEC","MuonAlignTGCEndCapCAlign-0001-DEFAULT",force=True,forceMC=True,className='CondAttrListCollection')
 
 conddb.blockFolder("/SCT/DAQ/Config/Chip")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True)
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True,className="CondAttrListVec")
 conddb.blockFolder("/SCT/DAQ/Config/Module")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True)
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True,className="CondAttrListVec")
 
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-23.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-23.py
index 33cd496fa9c30b9a8e4aa2efcae0f923db90f46a..acf529239d1a7028455153bbf02dd5a6397b771f 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-23.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-23.py
@@ -7,7 +7,7 @@ from RecExConfig.RecAlgsFlags import recAlgs
 #conddb.blockFolder("/MDT/RT")
 #conddb.addFolderWithTag("MDT_OFL","/MDT/RT","MDTRT_Sim-04",force=True,forceMC=True)
 conddb.blockFolder("/MDT/RTBLOB")
-conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True)
+conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True,className="CondAttrListCollection")
 
 #from Guillaume
 conddb.blockFolder("/LAR/LArCellPositionShift");
@@ -17,7 +17,7 @@ conddb.addOverride("/LAR/ElecCalibOfl/OFC/PhysWave/RTM/4samples1phase","LARElecC
 svcMgr.PoolSvc.ReadCatalog+=["xmlcatalog_file:"+"/cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml"]
 
 conddb.blockFolder("/PIXEL/ReadoutSpeed")
-conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True)
+conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True,className="AthenaAttributeList")
 
 conddb.blockFolder("/TRT/Cond/DigVers")
 conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions-01",force=True,forceMC=True,
@@ -31,10 +31,10 @@ printfunc ("RT OVERRIDE, for OFLCOND-MC16-SDR-23 ")
 
 conddb.blockFolder("/LAR/BadChannels/BadChannels");
 conddb.blockFolder("/LAR/BadChannelsOfl/BadChannels");
-conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/BadChannels","LArBadChannelsBadChannels-IOVDEP-08",force=True,forceMC=True);
+conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/BadChannels","LArBadChannelsBadChannels-IOVDEP-08",force=True,forceMC=True,className="CondAttrListCollection");
 conddb.blockFolder("/LAR/BadChannels/MissingFEBs");
 conddb.blockFolder("/LAR/BadChannelsOfl/MissingFEBs");
-conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True)
+conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True,className="AthenaAttributeList")
 
 if not "EOJT_alignMC" in globals():
     printfunc ("EOJT_alignMC not found in globals(), so aligning ID to data conditions")
@@ -68,7 +68,7 @@ if DetFlags.writeRDOPool.pixel_on():
     conddb.addFolder("PIXEL_OFL","/PIXEL/PixReco")
 
 conddb.blockFolder("/PIXEL/PixdEdx")
-conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True)
+conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True,className="AthenaAttributeList")
 mcIDoverlay=False
 if mcIDoverlay:
     printfunc ("ACH777: Using MC overlay Lorentz DB settings")
@@ -114,9 +114,9 @@ conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEA","MuonAlignTGCEndC
 conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEC","MuonAlignTGCEndCapCAlign-0001-DEFAULT",force=True,forceMC=True,className='CondAttrListCollection')
 
 conddb.blockFolder("/SCT/DAQ/Config/Chip")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True)
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True,className="CondAttrListVec")
 conddb.blockFolder("/SCT/DAQ/Config/Module")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True)
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True,className="CondAttrListVec")
 
 dofolderoverrides = True
 if dofolderoverrides:
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26.py
index 52de09ebb415d8e9353d0f35715814bfdc341cbb..54c3b25854d8dd0a293bec34304be82b7a29e0e9 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26.py
@@ -7,7 +7,7 @@ from RecExConfig.RecAlgsFlags import recAlgs
 #conddb.blockFolder("/MDT/RT")
 #conddb.addFolderWithTag("MDT_OFL","/MDT/RT","MDTRT_Sim-04",force=True,forceMC=True)
 conddb.blockFolder("/MDT/RTBLOB")
-conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True)
+conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True,className="CondAttrListCollection")
 
 #from Guillaume
 conddb.blockFolder("/LAR/LArCellPositionShift");
@@ -17,7 +17,7 @@ conddb.addOverride("/LAR/ElecCalibOfl/OFC/PhysWave/RTM/4samples1phase","LARElecC
 svcMgr.PoolSvc.ReadCatalog+=["xmlcatalog_file:"+"/cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml"]
 
 conddb.blockFolder("/PIXEL/ReadoutSpeed")
-conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True)
+conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True,className="AthenaAttributeList")
 
 conddb.blockFolder("/TRT/Cond/DigVers")
 conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions-01",force=True,forceMC=True,
@@ -31,10 +31,10 @@ printfunc ("RT OVERRIDE, for OFLCOND-MC16-SDR-26 MC condition tag ")
 
 conddb.blockFolder("/LAR/BadChannels/BadChannels");
 conddb.blockFolder("/LAR/BadChannelsOfl/BadChannels");
-conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/BadChannels","LArBadChannelsBadChannels-IOVDEP-08",force=True,forceMC=True);
+conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/BadChannels","LArBadChannelsBadChannels-IOVDEP-08",force=True,forceMC=True,className="CondAttrListCollection");
 conddb.blockFolder("/LAR/BadChannels/MissingFEBs");
 conddb.blockFolder("/LAR/BadChannelsOfl/MissingFEBs");
-conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True)
+conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True,className="AthenaAttributeList")
 
 if not "EOJT_alignMC" in globals():
     printfunc ("EOJT_alignMC not found in globals(), so aligning ID to data conditions")
@@ -68,7 +68,7 @@ if DetFlags.writeRDOPool.pixel_on():
     conddb.addFolder("PIXEL_OFL","/PIXEL/PixReco")
 
 conddb.blockFolder("/PIXEL/PixdEdx")
-conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True)
+conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True,className="AthenaAttributeList")
 mcIDoverlay=False
 if mcIDoverlay:
     printfunc ("ACH777: Using MC overlay Lorentz DB settings")
@@ -106,9 +106,9 @@ conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEA","MuonAlignTGCEndC
 conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEC","MuonAlignTGCEndCapCAlign-0001-DEFAULT",force=True,forceMC=True,className='CondAttrListCollection')
 
 conddb.blockFolder("/SCT/DAQ/Config/Chip")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True)
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True,className="CondAttrListVec")
 conddb.blockFolder("/SCT/DAQ/Config/Module")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True)
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True,className="CondAttrListVec")
 
 dofolderoverrides = True
 runN=365681
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26_folders100M.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26_folders100M.py
index d3ac9ef535aa00f719dca662f20677df25fd8bd3..40622f6a7e96f1d9932e6dc5fbd7ae8168de6e4c 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26_folders100M.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-26_folders100M.py
@@ -7,7 +7,7 @@ from RecExConfig.RecAlgsFlags import recAlgs
 #conddb.blockFolder("/MDT/RT")
 #conddb.addFolderWithTag("MDT_OFL","/MDT/RT","MDTRT_Sim-04",force=True,forceMC=True)
 conddb.blockFolder("/MDT/RTBLOB")
-conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True)
+conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True,className="CondAttrListCollection")
 
 #from Guillaume
 conddb.blockFolder("/LAR/LArCellPositionShift");
@@ -17,7 +17,7 @@ conddb.addOverride("/LAR/ElecCalibOfl/OFC/PhysWave/RTM/4samples1phase","LARElecC
 svcMgr.PoolSvc.ReadCatalog+=["xmlcatalog_file:"+"/cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml"]
 
 conddb.blockFolder("/PIXEL/ReadoutSpeed")
-conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True)
+conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True,className="AthenaAttributeList")
 
 conddb.blockFolder("/TRT/Cond/DigVers")
 conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions-01",force=True,forceMC=True,
@@ -31,10 +31,10 @@ printfunc ("RT OVERRIDE, for OFLCOND-MC16-SDR-26 ")
 
 conddb.blockFolder("/LAR/BadChannels/BadChannels");
 conddb.blockFolder("/LAR/BadChannelsOfl/BadChannels");
-conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/BadChannels","LArBadChannelsBadChannels-IOVDEP-08",force=True,forceMC=True);
+conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/BadChannels","LArBadChannelsBadChannels-IOVDEP-08",force=True,forceMC=True,className="CondAttrListCollection");
 conddb.blockFolder("/LAR/BadChannels/MissingFEBs");
 conddb.blockFolder("/LAR/BadChannelsOfl/MissingFEBs");
-conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True)
+conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True,className="AthenaAttributeList")
 
 if not "EOJT_alignMC" in globals():
     printfunc ("EOJT_alignMC not found in globals(), so aligning ID to data conditions")
@@ -68,7 +68,7 @@ if DetFlags.writeRDOPool.pixel_on():
     conddb.addFolder("PIXEL_OFL","/PIXEL/PixReco")
 
 conddb.blockFolder("/PIXEL/PixdEdx")
-conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True)
+conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True,className="AthenaAttributeList")
 mcIDoverlay=False
 if mcIDoverlay:
     printfunc ("ACH777: Using MC overlay Lorentz DB settings")
@@ -104,9 +104,9 @@ conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEA","MuonAlignTGCEndC
 conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEC","MuonAlignTGCEndCapCAlign-0001-DEFAULT",force=True,forceMC=True,className='CondAttrListCollection')
 
 conddb.blockFolder("/SCT/DAQ/Config/Chip")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True)
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True,className="CondAttrListVec")
 conddb.blockFolder("/SCT/DAQ/Config/Module")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True)
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True,className="CondAttrListVec")
 
 dofolderoverrides = True
 if dofolderoverrides:
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-27.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-27.py
index 5b997f90004ede866f1384da0a31f68aadee12bf..c9d33be0789a5c1c90abbf371a1dcf8bd3706715 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-27.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_OFLCOND-MC16-SDR-27.py
@@ -7,7 +7,7 @@ from RecExConfig.RecAlgsFlags import recAlgs
 #conddb.blockFolder("/MDT/RT")
 #conddb.addFolderWithTag("MDT_OFL","/MDT/RT","MDTRT_Sim-04",force=True,forceMC=True)
 conddb.blockFolder("/MDT/RTBLOB")
-conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True)
+conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-04-BLOB",force=True,forceMC=True,className="CondAttrListCollection")
 
 #from Guillaume
 conddb.blockFolder("/LAR/LArCellPositionShift");
@@ -17,7 +17,7 @@ conddb.addOverride("/LAR/ElecCalibOfl/OFC/PhysWave/RTM/4samples1phase","LARElecC
 svcMgr.PoolSvc.ReadCatalog+=["xmlcatalog_file:"+"/cvmfs/atlas-condb.cern.ch/repo/conditions/poolcond/PoolFileCatalog.xml"]
 
 conddb.blockFolder("/PIXEL/ReadoutSpeed")
-conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True)
+conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True,className="AthenaAttributeList")
 
 conddb.blockFolder("/TRT/Cond/DigVers")
 conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions-01",force=True,forceMC=True,
@@ -31,10 +31,10 @@ printfunc ("RT OVERRIDE, for OFLCOND-MC16-SDR-27 MC condition tag ")
 
 conddb.blockFolder("/LAR/BadChannels/BadChannels");
 conddb.blockFolder("/LAR/BadChannelsOfl/BadChannels");
-conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/BadChannels","LArBadChannelsBadChannels-IOVDEP-08",force=True,forceMC=True);
+conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/BadChannels","LArBadChannelsBadChannels-IOVDEP-08",force=True,forceMC=True,className="CondAttrListCollection");
 conddb.blockFolder("/LAR/BadChannels/MissingFEBs");
 conddb.blockFolder("/LAR/BadChannelsOfl/MissingFEBs");
-conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True)
+conddb.addFolderWithTag("LAR_OFL","/LAR/BadChannels/MissingFEBs","LArBadChannelsMissingFEBs-IOVDEP-04",force=True,forceMC=True,className="AthenaAttributeList")
 
 if not "EOJT_alignMC" in globals():
     printfunc ("EOJT_alignMC not found in globals(), so aligning ID to data conditions")
@@ -62,7 +62,7 @@ if DetFlags.writeRDOPool.pixel_on():
     conddb.addFolder("PIXEL_OFL","/PIXEL/PixReco")
 
 conddb.blockFolder("/PIXEL/PixdEdx")
-conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True)
+conddb.addFolderWithTag("PIXEL_OFL","/PIXEL/PixdEdx","PixdEdx-SIM-RUN124-000-00",force=True,forceMC=True,className="AthenaAttributeList")
 mcIDoverlay=True
 if mcIDoverlay:
     printfunc ("ACH777: Using MC overlay Lorentz DB settings")
@@ -102,9 +102,9 @@ conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEA","MuonAlignTGCEndC
 conddb.addFolderWithTag("MUONALIGN_OFL","/MUONALIGN/TGC/SIDEC","MuonAlignTGCEndCapCAlign-0001-DEFAULT",force=True,forceMC=True,className='CondAttrListCollection')
 
 conddb.blockFolder("/SCT/DAQ/Config/Chip")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True)
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Chip","/SCT/DAQ/Config/Chip",force=True,className="CondAttrListVec")
 conddb.blockFolder("/SCT/DAQ/Config/Module")
-conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True)
+conddb.addFolderSplitMC("SCT","/SCT/DAQ/Config/Module","/SCT/DAQ/Config/Module",force=True,className="CondAttrListVec")
 
 dofolderoverrides = True
 runN=365681
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_old.py b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_old.py
index 08be4e5deb40848a3ce9e0dc4bd5d7b8724a04a2..21112501e6e14f992e4a898bfce1dad540714f0f 100755
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_old.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/Rt_override_old.py
@@ -12,14 +12,14 @@ conddb.addFolderWithTag("TRT_OFL","/TRT/Calib/RT","TrtCalibRt-MC09_900GeV-REP-Fi
 conddb.blockFolder("/MDT/RT")
 conddb.addFolderWithTag("MDT_OFL","/MDT/RT","MDTRT_Sim-00",force=True,forceMC=True)
 conddb.blockFolder("/MDT/RTBLOB")
-conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-00-BLOB",force=True,forceMC=True)
+conddb.addFolderWithTag("MDT_OFL","/MDT/RTBLOB","MDTRT_Sim-00-BLOB",force=True,forceMC=True,className="CondAttrListCollection")
 
 conddb.blockFolder("/PIXEL/HLT/DCS/HV")
 conddb.addFolderWithTag("PIXEL_ONL","/PIXEL/HLT/DCS/HV","PixDCSHV-UPD1-00",force=True,forceData=True)
 conddb.blockFolder("/PIXEL/HLT/DCS/TEMPERATURE")
 conddb.addFolderWithTag("PIXEL_ONL","/PIXEL/HLT/DCS/TEMPERATURE","PixDCSTemp-UPD1-00",force=True,forceData=True)
 conddb.blockFolder("/PIXEL/ReadoutSpeed")
-conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True)
+conddb.addFolderSplitMC("PIXEL","/PIXEL/ReadoutSpeed","/PIXEL/ReadoutSpeed",force=True,className="AthenaAttributeList")
 
 conddb.blockFolder("/TRT/Cond/DigVers")
 conddb.addFolderWithTag("TRT_OFL","/TRT/Cond/DigVers","TRTCondDigVers-Collisions-01",force=True,forceMC=True,
diff --git a/LArCalorimeter/LArBadChannelTool/python/LArBadChannelConfig.py b/LArCalorimeter/LArBadChannelTool/python/LArBadChannelConfig.py
index 44ff1145650a2bf9441dcb75e3178dab7ca96bf2..8963b7a358e2d8819c08eceb40d167cfd6becefc 100644
--- a/LArCalorimeter/LArBadChannelTool/python/LArBadChannelConfig.py
+++ b/LArCalorimeter/LArBadChannelTool/python/LArBadChannelConfig.py
@@ -11,7 +11,10 @@ def LArBadChannelCfg(configFlags, tag=None):
     result=LArOnOffIdMappingCfg(configFlags)
     rekey="/LAR/BadChannels/BadChannels"
 
-    if configFlags.Input.isMC:
+    if configFlags.Overlay.DataOverlay:
+        # TODO: move this in a better location
+        result.merge(addFolders(configFlags, "/LAR/BadChannels/BadChannels", "LAR_OFL", className="CondAttrListCollection", tag="LARBadChannelsBadChannels-HECAQ3Missing", db="OFLP200"))
+    elif configFlags.Input.isMC:
         result.merge(addFolders(configFlags,"/LAR/BadChannels/BadChannels","LAR_OFL",tag=tag,
                                 className="CondAttrListCollection"))
     else:
@@ -27,7 +30,10 @@ def LArBadFebCfg(configFlags, tag=None):
     result=ComponentAccumulator()
     rekey="/LAR/BadChannels/MissingFEBs"
 
-    if configFlags.Input.isMC:
+    if configFlags.Overlay.DataOverlay:
+        # TODO: move this in a better location
+        result.merge(addFolders(configFlags, "/LAR/BadChannels/MissingFEBs", "LAR_OFL", className="AthenaAttributeList", tag="LArBadChannelsMissingFEBs-IOVDEP-04", db="OFLP200"))
+    elif configFlags.Input.isMC:
         result.merge(addFolders(configFlags,"/LAR/BadChannels/MissingFEBs","LAR_OFL",tag=tag,
                                 className="AthenaAttributeList"))
     else: