diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_AMeta.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_AMeta.ref
index d5dab9e7d0d39e925ffb4b085eabe1bea614538e..a158871c9c871a6db0a158d31af2a600babf4eb5 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_AMeta.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_AMeta.ref
@@ -34,6 +34,8 @@ PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc             DEBUG OutputLevel is 2
 PoolSvc              INFO Setting up APR FileCatalog and Streams
 PoolSvc              INFO POOL WriteCatalog is xmlcatalog_file:Catalog2.xml
+DbSession Info     Open     DbSession    
+Domain[ROOT_All] Info >   Access   DbDomain     READ      [ROOT_All] 
 PoolSvc              INFO Re-initializing PoolSvc
 Stream1.Stream1...  DEBUG Property update for OutputLevel : new value = 2
 Stream1             DEBUG Property update for OutputLevel : new value = 2
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Append.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Append.ref
index 81a4c19feafb729e47b33c8da1e20e6adbf862d9..6802651161b2f3223b0772868f212e7b2e0e7be8 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Append.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Append.ref
@@ -41,6 +41,8 @@ PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc             DEBUG OutputLevel is 2
 PoolSvc              INFO Setting up APR FileCatalog and Streams
 PoolSvc              INFO POOL WriteCatalog is xmlcatalog_file:Catalog1.xml
+DbSession Info     Open     DbSession    
+Domain[ROOT_All] Info >   Access   DbDomain     READ      [ROOT_All] 
 PoolSvc              INFO Re-initializing PoolSvc
 Stream1             DEBUG Found StoreGateSvc store.
 Stream1             DEBUG Found MetaDataStore store.
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_AppendFast.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_AppendFast.ref
index 33d3351c48da7a12171b83f01c2bd79e36f02de0..68fbedb6bfeea460dd194ae48b8022b4c6069eec 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_AppendFast.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_AppendFast.ref
@@ -1,3 +1,4 @@
+Fri Apr 14 22:43:27 CEST 2017
 Preloading tcmalloc_minimal.so
 Athena               INFO including file "AthenaCommon/Preparation.py"
 Athena               INFO including file "AthenaCommon/Bootstrap.py"
@@ -5,11 +6,14 @@ Athena               INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Athena               INFO executing ROOT6Setup
 Athena               INFO including file "AthenaCommon/Execution.py"
 Athena               INFO including file "AthenaPoolExampleAlgorithms/AthenaPoolExample_AppendFastJobOptions.py"
+Py:ConfigurableDb    INFO Read module info for 5293 configurables from 10 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 Athena               INFO including file "AthenaCommon/runbatch.py"
 ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v28r1)
+                                          running on lxplus037.cern.ch on Fri Apr 14 22:43:39 2017
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -17,8 +21,10 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 StatusCodeSvc        INFO initialize
 AthDictLoaderSvc     INFO in initialize...
 AthDictLoaderSvc     INFO acquired Dso-registry
+ClassIDSvc           INFO  getRegistryEntries: read 2303 CLIDRegistry entries for module ALL
 ChronoStatSvc        INFO  Number of skipped events for MemStat-1
 CoreDumpSvc          INFO install f-a-t-a-l handler... (flag = -1)
+AthenaEventLoopMgr   INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
 WriteData           DEBUG Property update for OutputLevel : new value = 2
 WriteData            INFO in initialize()
 WriteData           DEBUG input handles: 0
@@ -26,27 +32,39 @@ WriteData           DEBUG output handles: 0
 WriteData           DEBUG Data Deps for WriteData
 WriteTag             INFO in initialize()
 Stream2.Stream2...  DEBUG Property update for OutputLevel : new value = 2
+ClassIDSvc           INFO  getRegistryEntries: read 1687 CLIDRegistry entries for module ALL
 Stream2             DEBUG Property update for OutputLevel : new value = 2
 Stream2             DEBUG In initialize 
 Stream2             DEBUG Found IDecisionSvc.
 DecisionSvc          INFO Inserting stream: Stream2 with no Algs
 Stream2             DEBUG End initialize 
 Stream2             DEBUG In initialize
+MetaDataSvc          INFO Initializing MetaDataSvc - package version AthenaServices-00-00-00
 AthenaPoolCnvSvc    DEBUG Property update for OutputLevel : new value = 2
+AthenaPoolCnvSvc     INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
 PoolSvc             DEBUG Property update for OutputLevel : new value = 2
 PoolSvc              INFO io_register[PoolSvc](xmlcatalog_file:Catalog1.xml) [ok]
 PoolSvc              INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc              INFO Frontier compression level set to 5
+DBReplicaSvc         INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://aiatlas036.cern.ch:8000/atlr)(serverurl=http://aiatlas034.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier01.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier05.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca20.cern.ch:3128)(proxyurl=http://ca17.cern.ch:3128)(proxyurl=http://atlast0fsquid.cern.ch:3128)(proxyurl=http://atlassquid1.cern.ch:3128)(proxyurl=http://atlassquid2.cern.ch:3128)(proxyurl=http://atlassquid4.cern.ch:3128) will be considered for COOL data
+DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2017-04-13T2225/Athena/22.0.0/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
+DBReplicaSvc         INFO Total of 10 servers found for host lxplus037.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc             DEBUG OutputLevel is 2
 PoolSvc              INFO Setting up APR FileCatalog and Streams
 PoolSvc              INFO POOL WriteCatalog is xmlcatalog_file:Catalog1.xml
+DbSession Info     Open     DbSession    
+Domain[ROOT_All] Info >   Access   DbDomain     READ      [ROOT_All] 
 PoolSvc              INFO Re-initializing PoolSvc
 Stream2             DEBUG Found StoreGateSvc store.
 Stream2             DEBUG Found MetaDataStore store.
+OutputStreamSeq...   INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
+ClassIDSvc           INFO  getRegistryEntries: read 1210 CLIDRegistry entries for module ALL
 Stream2.Stream2...  DEBUG Property update for OutputLevel : new value = 2
+Stream2.Stream2...   INFO Initializing Stream2.Stream2Tool - package version OutputStreamAthenaPool-00-00-00
 Stream2.Stream2...   INFO streamProperty ProcessingTag = Stream2
 Stream2.Stream2...  DEBUG Property update for OutputLevel : new value = 2
+Stream2.Stream2...   INFO Initializing Stream2.Stream2_MakeEventStreamInfo - package version OutputStreamAthenaPool-00-00-00
 Stream2              INFO Found HelperTools = PrivateToolHandleArray(['MakeEventStreamInfo/Stream2_MakeEventStreamInfo'])
 Stream2              INFO Data output: SimplePoolFileB.root
 Stream2              INFO I/O reinitialization...
@@ -86,6 +104,7 @@ AthenaEventLoopMgr   INFO   ===>>>  start of run 2    <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #20, run #2 0 events processed so far  <<<===
 WriteData           DEBUG in execute()
 WriteData            INFO EventInfo event: 20  run: 2
+ClassIDSvc           INFO  getRegistryEntries: read 104 CLIDRegistry entries for module ALL
 WriteData            INFO registered all data
 WriteTag             INFO EventInfo event: 20  run: 2
 WriteTag             INFO registered all data
@@ -194,6 +213,7 @@ POOLCollectionTree(MagicNumber) Debug Branch container 'MagicNumber'
 POOLCollectionTree(MagicNumber) Debug Opened container POOLCollectionTree(MagicNumber) of type ROOT_Tree
 SimplePoolFileB.root Debug --->Adding Assoc :????/POOLCollectionTree(MagicNumber) [202]  (9 , ffffffff)
 SimplePoolFileB.root Debug ---->ClassID:????
+ClassIDSvc           INFO  getRegistryEntries: read 96 CLIDRegistry entries for module ALL
 SimplePoolFileB.root Debug --> Access   DbContainer  CREA/UPDA [ROOT_Tree] POOLContainer(basic/DataHeader)
 POOLContainer(basic/DataHeader) Debug Opening
 POOLContainer(basic/DataHeader) Debug    attributes# = 1
@@ -630,6 +650,7 @@ MetaDataHdr(DataHeader) Debug Branch container 'DataHeader'
 MetaDataHdr(DataHeader) Debug Opened container MetaDataHdr(DataHeader) of type ROOT_Tree
 SimplePoolFileB.root Debug --->Adding Assoc :????/MetaDataHdr(DataHeader) [202]  (d , ffffffff)
 SimplePoolFileB.root Debug ---->ClassID:????
+ClassIDSvc           INFO  getRegistryEntries: read 5 CLIDRegistry entries for module ALL
 Stream2              INFO Records written: 21
 Stream2             DEBUG Leaving handle
 RegStream2          DEBUG handle() incident type: MetaDataStop
@@ -643,8 +664,8 @@ RootCollection Debug Commit: saving collection TTree to file: SimplePoolCollecti
 RootCollection Debug    bytes written to TTree ????
 RootCollection::MetadataCommit Debug Bytes written to the Metadata TTree ????
 RootCollection Info Closing open collection 'SimplePoolCollection2.root'
+Domain[ROOT_All] Info >   Deaccess DbDomain     READ      [ROOT_All] 
 Domain[ROOT_All] Info ->  Deaccess DbDatabase   CREATE    [ROOT_All] ????
-Domain[ROOT_All] Info >   Deaccess DbDomain     READ      [ROOT_All]
 Domain[ROOT_All] Info >   Deaccess DbDomain     UPDATE    [ROOT_All] 
 ApplicationMgr       INFO Application Manager Stopped successfully
 IncidentProcAlg1     INFO Finalize
@@ -663,6 +684,11 @@ ToolSvc              INFO Removing all tools created by ToolSvc
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
+fRep_ALL             INFO Time User   : Tot=    0 [us] Ave/Min/Max=    0(+-    0)/    0/    0 [us] #= 62
+commitOutput         INFO Time User   : Tot=   20 [ms] Ave/Min/Max=0.952(+- 2.94)/    0/   10 [ms] #= 21
+cRepR_ALL            INFO Time User   : Tot=   70 [ms] Ave/Min/Max=0.383(+- 2.64)/    0/   30 [ms] #=183
+cRep_ALL             INFO Time User   : Tot=  270 [ms] Ave/Min/Max= 4.35(+- 20.4)/    0/  150 [ms] #= 62
+ChronoStatSvc        INFO Time User   : Tot= 2.65  [s]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Concat.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Concat.ref
index 0ed350512e3b8afb199d7bbe182a9eec7d2102c8..98225205cc2dbc06689ccb016d1d2f29ccdbc18a 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Concat.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Concat.ref
@@ -40,6 +40,8 @@ PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc             DEBUG OutputLevel is 2
 PoolSvc              INFO Setting up APR FileCatalog and Streams
 PoolSvc              INFO POOL WriteCatalog is xmlcatalog_file:Catalog1.xml
+DbSession Info     Open     DbSession    
+Domain[ROOT_All] Info >   Access   DbDomain     READ      [ROOT_All] 
 PoolSvc              INFO Re-initializing PoolSvc
 Stream1             DEBUG Found StoreGateSvc store.
 Stream1             DEBUG Found MetaDataStore store.
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RWBs.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RWBs.ref
index c03df69c42b3ddcbe99dd7186970aab9a5a09203..cab09b2f5d706f8040033c3e7dbf2cbafb662683 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RWBs.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RWBs.ref
@@ -43,6 +43,8 @@ PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc             DEBUG OutputLevel is 2
 PoolSvc              INFO Setting up APR FileCatalog and Streams
 PoolSvc              INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
+DbSession Info     Open     DbSession    
+Domain[ROOT_All] Info >   Access   DbDomain     READ      [ROOT_All] 
 PoolSvc              INFO Re-initializing PoolSvc
 ReadBs              DEBUG input handles: 0
 ReadBs              DEBUG output handles: 0
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RWcBs.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RWcBs.ref
index 0a1fdc3a78edac9485033eff78d26eaf15dba9e0..2b260065a25e8df12b9e5db34318405d74ff04e6 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RWcBs.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RWcBs.ref
@@ -43,6 +43,8 @@ PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc             DEBUG OutputLevel is 2
 PoolSvc              INFO Setting up APR FileCatalog and Streams
 PoolSvc              INFO POOL WriteCatalog is xmlcatalog_file:PoolFileCatalog.xml
+DbSession Info     Open     DbSession    
+Domain[ROOT_All] Info >   Access   DbDomain     READ      [ROOT_All] 
 PoolSvc              INFO Re-initializing PoolSvc
 ReadBs              DEBUG input handles: 0
 ReadBs              DEBUG output handles: 0
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMeta.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMeta.ref
index 6a51713c1bb5af6b9424f609babf767cc204c289..9ffe181af40b5fc67500ac5f9eb358efb91cb04c 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMeta.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMeta.ref
@@ -34,6 +34,8 @@ PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc             DEBUG OutputLevel is 2
 PoolSvc              INFO Setting up APR FileCatalog and Streams
 PoolSvc              INFO POOL WriteCatalog is xmlcatalog_file:Catalog2.xml
+DbSession Info     Open     DbSession    
+Domain[ROOT_All] Info >   Access   DbDomain     READ      [ROOT_All] 
 PoolSvc              INFO Re-initializing PoolSvc
 Stream1.Stream1...  DEBUG Property update for OutputLevel : new value = 2
 Stream1             DEBUG Property update for OutputLevel : new value = 2
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Write.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Write.ref
index d4f4c070115ccfb12e99e9c45ef05588fb02da0f..9d7c3cac779f6666ad62ea9a00678a15fe28f333 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Write.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_Write.ref
@@ -42,6 +42,8 @@ PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc             DEBUG OutputLevel is 2
 PoolSvc              INFO Setting up APR FileCatalog and Streams
 PoolSvc              INFO POOL WriteCatalog is xmlcatalog_file:Catalog1.xml
+DbSession Info     Open     DbSession    
+Domain[ROOT_All] Info >   Access   DbDomain     READ      [ROOT_All] 
 PoolSvc              INFO Re-initializing PoolSvc
 Stream1             DEBUG Found StoreGateSvc store.
 Stream1             DEBUG Found MetaDataStore store.
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WriteFast.ref b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WriteFast.ref
index 3d620465bf9a1738240696da0c40a12f713929f0..8942ee7f94013dae0067682809b40d89b2a9577b 100644
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WriteFast.ref
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WriteFast.ref
@@ -1,4 +1,4 @@
-Fri Mar 31 17:07:21 CEST 2017
+Fri Apr 14 23:09:30 CEST 2017
 Preloading tcmalloc_minimal.so
 Athena               INFO including file "AthenaCommon/Preparation.py"
 Athena               INFO including file "AthenaCommon/Bootstrap.py"
@@ -6,14 +6,14 @@ Athena               INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Athena               INFO executing ROOT6Setup
 Athena               INFO including file "AthenaCommon/Execution.py"
 Athena               INFO including file "AthenaPoolExampleAlgorithms/AthenaPoolExample_WriteFastJobOptions.py"
-Py:ConfigurableDb    INFO Read module info for 5278 configurables from 36 genConfDb files
+Py:ConfigurableDb    INFO Read module info for 5293 configurables from 10 genConfDb files
 Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 Athena               INFO including file "AthenaCommon/runbatch.py"
 ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
                                                    Welcome to ApplicationMgr (GaudiCoreSvc v28r1)
-                                          running on lxplus009.cern.ch on Fri Mar 31 17:07:33 2017
+                                          running on lxplus037.cern.ch on Fri Apr 14 23:09:43 2017
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
@@ -21,12 +21,10 @@ ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to leve
 StatusCodeSvc        INFO initialize
 AthDictLoaderSvc     INFO in initialize...
 AthDictLoaderSvc     INFO acquired Dso-registry
-ClassIDSvc           INFO  getRegistryEntries: read 2251 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 2303 CLIDRegistry entries for module ALL
 ChronoStatSvc        INFO  Number of skipped events for MemStat-1
 CoreDumpSvc          INFO install f-a-t-a-l handler... (flag = -1)
 AthenaEventLoopMgr   INFO Initializing AthenaEventLoopMgr - package version AthenaServices-00-00-00
-AthMasterSeq         INFO Member list: AthSequencer/AthAlgSeq, AthSequencer/AthOutSeq, AthSequencer/AthRegSeq
-AthAlgSeq            INFO Member list: AthPoolEx::WriteData/WriteData, AthPoolEx::WriteTag/WriteTag, AthPoolEx::WriteTag/MagicWriteTag, AthenaOutputStream/Stream1, AthenaOutputStream/Stream2, AthPoolEx::PassNoneFilter/PassNoneFilter, AthenaOutputStream/Stream3, RegistrationStream/RegStream1, RegistrationStream/RegStream2, RegistrationStream/RegStream3
 WriteData           DEBUG Property update for OutputLevel : new value = 2
 WriteData            INFO in initialize()
 WriteData           DEBUG input handles: 0
@@ -35,7 +33,7 @@ WriteData           DEBUG Data Deps for WriteData
 WriteTag             INFO in initialize()
 MagicWriteTag        INFO in initialize()
 Stream1.Stream1...  DEBUG Property update for OutputLevel : new value = 2
-ClassIDSvc           INFO  getRegistryEntries: read 1686 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 1687 CLIDRegistry entries for module ALL
 Stream1             DEBUG Property update for OutputLevel : new value = 2
 Stream1             DEBUG In initialize 
 Stream1             DEBUG Found IDecisionSvc.
@@ -46,13 +44,12 @@ MetaDataSvc          INFO Initializing MetaDataSvc - package version AthenaServi
 AthenaPoolCnvSvc    DEBUG Property update for OutputLevel : new value = 2
 AthenaPoolCnvSvc     INFO Initializing AthenaPoolCnvSvc - package version AthenaPoolCnvSvc-00-00-00
 PoolSvc             DEBUG Property update for OutputLevel : new value = 2
-PoolSvc              INFO Initializing PoolSvc - package version PoolSvc-00-00-00
 PoolSvc              INFO io_register[PoolSvc](xmlcatalog_file:Catalog1.xml) [ok]
 PoolSvc              INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc              INFO Frontier compression level set to 5
 DBReplicaSvc         INFO Frontier server at (serverurl=http://atlasfrontier-ai.cern.ch:8000/atlr)(serverurl=http://aiatlas036.cern.ch:8000/atlr)(serverurl=http://aiatlas034.cern.ch:8000/atlr)(serverurl=http://ccfrontier.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier01.in2p3.fr:23128/ccin2p3-AtlasFrontier)(serverurl=http://ccfrontier05.in2p3.fr:23128/ccin2p3-AtlasFrontier)(proxyurl=http://ca-proxy.cern.ch:3128)(proxyurl=http://ca20.cern.ch:3128)(proxyurl=http://ca17.cern.ch:3128)(proxyurl=http://atlast0fsquid.cern.ch:3128)(proxyurl=http://atlassquid1.cern.ch:3128)(proxyurl=http://atlassquid2.cern.ch:3128)(proxyurl=http://atlassquid4.cern.ch:3128) will be considered for COOL data
-DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2017-03-30T2225/Athena/22.0.0/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
-DBReplicaSvc         INFO Total of 10 servers found for host lxplus009.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
+DBReplicaSvc         INFO Read replica configuration from /cvmfs/atlas-nightlies.cern.ch/repo/sw/master/2017-04-13T2225/Athena/22.0.0/InstallArea/x86_64-slc6-gcc62-dbg/share/dbreplica.config
+DBReplicaSvc         INFO Total of 10 servers found for host lxplus037.cern.ch [ATLF ATLAS_COOLPROD atlas_dd ATLAS_CONFIG INT8R INTR ATONR_COOL ATONR_CONF DEVDB11 ATLF ]
 PoolSvc              INFO Successfully setup replica sorting algorithm
 PoolSvc             DEBUG OutputLevel is 2
 PoolSvc              INFO Setting up APR FileCatalog and Streams
@@ -63,7 +60,7 @@ PoolSvc              INFO Re-initializing PoolSvc
 Stream1             DEBUG Found StoreGateSvc store.
 Stream1             DEBUG Found MetaDataStore store.
 OutputStreamSeq...   INFO Initializing OutputStreamSequencerSvc - package version AthenaServices-00-00-00
-ClassIDSvc           INFO  getRegistryEntries: read 1208 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 1210 CLIDRegistry entries for module ALL
 Stream1.Stream1...  DEBUG Property update for OutputLevel : new value = 2
 Stream1.Stream1...   INFO Initializing Stream1.Stream1Tool - package version OutputStreamAthenaPool-00-00-00
 Stream1.Stream1...   INFO streamProperty ProcessingTag = Stream1
@@ -172,7 +169,7 @@ HistogramPersis...WARNING Histograms saving not required.
 EventSelector        INFO  Enter McEventSelector Initialization 
 AthenaEventLoopMgr   INFO Setup EventSelector service EventSelector
 ApplicationMgr       INFO Application Manager Initialized successfully
-ClassIDSvc           INFO  getRegistryEntries: read 544 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 546 CLIDRegistry entries for module ALL
 ApplicationMgr       INFO Application Manager Started successfully
 EventPersistenc...   INFO Added successfully Conversion service:McCnvSvc
 AthenaEventLoopMgr   INFO   ===>>>  start of run 1    <<<===
@@ -1456,10 +1453,8 @@ EmptyPoolFile.root Debug ---->ClassID:????
 EmptyPoolFile.root Debug --->Adding Shape[2 , ????]:  [1 Column(s)] 
 EmptyPoolFile.root Debug ---->Class:DataHeader_p5
 EmptyPoolFile.root Debug ---->[0]:DataHeader_p5 Typ:DataHeader_p5 [21] Size:0 Offset:0 #Elements:1
-PoolSvc             DEBUG Failed to get ContainerHandle for: POOLContainer(DataHeader)
 PoolSvc             DEBUG Failed to get ContainerHandle to set POOL property.
 AthenaPoolCnvSvc    DEBUG setAttribute failed for BRANCH_BASKET_SIZE to 256000 for db: EmptyPoolFile.root and cont: POOLContainer(DataHeader)
-PoolSvc             DEBUG Failed to get ContainerHandle for: POOLContainerForm(DataHeaderForm)
 PoolSvc             DEBUG Failed to get ContainerHandle to set POOL property.
 AthenaPoolCnvSvc    DEBUG setAttribute failed for BRANCH_BASKET_SIZE to 1024000 for db: EmptyPoolFile.root and cont: POOLContainerForm(DataHeaderForm)
 AthenaPoolCnvSvc    DEBUG commitOutput failed process POOL container attributes.
@@ -1521,6 +1516,7 @@ Domain[ROOT_All] Info ->  Deaccess DbDatabase   CREATE    [ROOT_All] ????
 Domain[ROOT_All] Info ->  Deaccess DbDatabase   CREATE    [ROOT_All] ????
 Domain[ROOT_All] Info >   Deaccess DbDomain     UPDATE    [ROOT_All] 
 ApplicationMgr       INFO Application Manager Stopped successfully
+IncidentProcAlg1     INFO Finalize
 WriteData            INFO in finalize()
 WriteTag             INFO in finalize()
 MagicWriteTag        INFO in finalize()
@@ -1531,11 +1527,8 @@ Stream2             DEBUG finalize: end optimize output
 RegStream1          DEBUG In finalize
 RegStream2          DEBUG In finalize
 RegStream3          DEBUG In finalize
-AthAlgSeq            INFO Finalizing AthAlgSeq...
 WriteData           DEBUG Calling destructor
-AthOutSeq            INFO Finalizing AthOutSeq...
-AthRegSeq            INFO Finalizing AthRegSeq...
-AthMasterSeq         INFO Finalizing AthMasterSeq...
+IncidentProcAlg2     INFO Finalize
 EventSelector        INFO finalize
 AthenaPoolCnvSvc    DEBUG releasing all workers
 DecisionSvc          INFO Finalized successfully.
@@ -1545,10 +1538,10 @@ ToolSvc              INFO Removing all tools created by ToolSvc
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
 fRep_ALL             INFO Time User   : Tot=    0 [us] Ave/Min/Max=    0(+-    0)/    0/    0 [us] #=146
-commitOutput         INFO Time User   : Tot=   30 [ms] Ave/Min/Max=0.698(+- 2.55)/    0/   10 [ms] #= 43
-cRepR_ALL            INFO Time User   : Tot=  110 [ms] Ave/Min/Max=0.283(+- 2.07)/    0/   30 [ms] #=389
-cRep_ALL             INFO Time User   : Tot=  300 [ms] Ave/Min/Max= 2.05(+- 11.4)/    0/  120 [ms] #=146
-ChronoStatSvc        INFO Time User   : Tot= 2.42  [s]                                             #=  1
+commitOutput         INFO Time User   : Tot=   40 [ms] Ave/Min/Max= 0.93(+-  2.9)/    0/   10 [ms] #= 43
+cRepR_ALL            INFO Time User   : Tot=   80 [ms] Ave/Min/Max=0.206(+- 1.74)/    0/   20 [ms] #=389
+cRep_ALL             INFO Time User   : Tot=  380 [ms] Ave/Min/Max=  2.6(+- 14.3)/    0/  140 [ms] #=146
+ChronoStatSvc        INFO Time User   : Tot= 2.98  [s]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/test/athenarun_test.sh.in b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/test/athenarun_test.sh.in
index c3fad80ebe49da3f40f41d2fdbb6b94a88f2e08b..21efd7595a0cd6d14083c9ce99d613b0c393e8b9 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/test/athenarun_test.sh.in
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/test/athenarun_test.sh.in
@@ -7,100 +7,29 @@
 # 
  
 # Transmit errors: 
-set -e 
- 
-# Execute the job: 
-@toExecute@ |
-	# For now drop some configurable warnings, they are not mine...
-	grep -v "^Py:PropertyProxy " |\
-	grep -v "^removing: " |\
-	grep -v "using release" |\
-	grep -v "Warning in <TEnvRec::ChangeValue>:" |\
-	grep -v "Error in <TCint::AutoLoad>: failure loading library " |\
-	grep -v "Error in <TCint::AutoLoadCallback>: failure loading library " |\
-	grep -v "Welcome to ApplicationMgr " |\
-	grep -v "running on " |\
-	grep -v "Skipping" |\
-	grep -v "Debug endTransaction:" |\
-	# Py:Athena will be Athena
-	sed -e 's/^.*Py:Athena /Athena    /g' |\
-	# Pointer addresses (mark 0)
-	sed -e 's/0x0\{8\}/0x!!!!/g' |\
-	sed -e 's/0x[0-9a-f]\{8\}/0x????/g' |\
-	sed -e 's/0x0\{7\}/0x!!!!/g' |\
-	sed -e 's/0x[0-9a-f]\{7\}/0x????/g' |\
-	# Rounding error etc
-	#sed -e 's/\.\([0-9]\{2\}\)[0-9]*/.\1/g' |\
-	#sed -e 's/ nan / inf /g' |\
-	# POOL id
-	sed -e 's/0\{8\}-0\{4\}-0\{4\}-0\{4\}-0\{12\}/!!!!/g' |\
-	sed -e 's/[0-9A-F]\{8\}-[0-9A-F]\{4\}-[0-9A-F]\{4\}-[0-9A-F]\{4\}-[0-9A-F]\{12\}/????/g' |\
-	sed -e 's/TTree [0-9]\{3\}[0-9]*/TTree ????/g' |\
-	sed -e 's/Bytes: [0-9]\{3\}[0-9]*/Bytes: ????/g' |\
-	# 64 bit offsets
-	sed -e 's/fffffffff/f/g' |\
-	sed -e 's/000000000/0/g' |\
-	# package names e.g. Package-00-00-00
-	sed -e 's/-r[0-9]\{6\}/-??-??-??/g' |\
-	sed -e 's/-[0-9]\{2\}-[0-9]\{2\}-[0-9]\{2\}/-??-??-??/g' |\
-	# pool attributes values
-	sed -e 's/\[BYTES_READ\]: 0/\[BYTES_READ\]: !!!!/g' |\
-	sed -e 's/\[BYTES_READ\]: [1-9][0-9]*/\[BYTES_READ\]: ????/g' |\
-	# ignore UnixTimestamp printouts
-	egrep -a -v 'ReadData             INFO CollectionMetadata, key = UnixTimestamp, value = ' |\
-	# ignore cpu usage printouts
-	egrep -a -v 'ChronoStatSvc +INFO Time' |\
-	egrep -a -v 'Time left.+ Seconds' |\
-	egrep -a -v 'Timeleft.+ sec' |\
-	egrep -a -v 'INFO Time User' |\
-	# ignore date and release
-	egrep -a -v '[Mon|Tue|Wed|Thu|Fri|Sat|Sun] [[:alpha:]]{3} +[[:digit:]]+ [[:digit:]]{2}:[[:digit:]]{2}:[[:digit:]]{2}' |\
-	# Collection MetaData
-	sed -e 's/Metadata TTree 0/Metadata TTree !!!/g' |\
-	sed -e 's/Metadata TTree [0-9]\{3\}/Metadata TTree ???/g' |\
-	# Remove Archive Prefix
-	sed -e 's/root:\/\/castoratlas\/\/castor\/cern.ch\/user\/g\/gemmeren\/ArchiveFile.zip#EmptyPoolFile/EmptyPoolFile/g' |\
-	sed -e 's/root:\/\/castoratlas\/\/castor\/cern.ch\/user\/g\/gemmeren\/ArchiveFile.zip#SimplePoolFile/SimplePoolFile/g' |\
-	sed -e 's/ArchiveFile.zip#EmptyPoolFile/EmptyPoolFile/g' |\
-	sed -e 's/ArchiveFile.zip#SimplePoolFile/SimplePoolFile/g' |\
-	# Stream wildcard
-	sed -e 's/INFO CLID = 222376821, key = Stream[12]/INFO CLID = 222376821, key = StreamX/g' |\
-	grep -v "^Stream[1-9]             DEBUG Wild card in key: begining part -  ending part -" |\
-	grep -v "^PluginMgr            INFO loaded plugin info for [0-9]* components" |\
-	grep -v "^Py:PropertyProxy     INFO Read module info for [0-9]* configurables from [0-9]* rootmap files" |\
-	grep -v "^DllClassManager      INFO readPluginInfo: loaded plugin info for" |\
-	grep -v "^Py:ConfigurableDb    INFO Read module info for" |\
-	grep -v "^DetDescrCnvSvc       INFO " |\
-	grep -v "^EventPersistenc...   INFO Added successfully Conversion service:DetDescrCnvSvc" |\
-	sed -e "s/ 'DetDescrCnvSvc' ,//g" |\
-	# HistorySvc
-	grep -v "^HistorySvc" |\
-	# ExampleHit Streamer for new object.
-	grep -v "Found unknown streamer checksum" |\
-	# CLHEP Streamer.
-	grep -v "AthenaRootStrea...   INFO   - Streamer name:" |\
-	grep -v "AthenaRootStrea...   INFO ROOT Streamer for" |\
-	grep -v "AthenaRootStrea...   INFO Adopted streamer for class" |\
-	grep -v "DBReplicaSvc         INFO " |\
-	# lib maps
-	grep -v "^map " |\
-	grep -v "^value " |\
-	# ROOT file version
-	grep -v "Root file version:" |\
-	grep -v "File version:" |\
-	# ClassIDSvc and ServiceManager messages
-	grep -v "^ClassIDSvc" |\
-	grep -v "^ServiceManager" |\
-	grep -v "^CoreDumpSvc          INFO Handling signals" |\
-	grep -v "Initializing AddressRemappingSvc" |\
-	grep -v "SG::HiveMgrSvc" |\
-	# Strange Chars from ApplicationMgr
-	sed -e "s/^..*ApplicationMgr/ApplicationMgr/" |\
-        # Ordering sensitivities
-	egrep -v "Deaccess DbContainer|RootDatabase.close Debug I/O|Database being retired" |\
-        # Other
-        grep -v "Not a threaded app" |\
-        grep -v "package version" |\
-        grep -v "Fd:" |\
-	# Empty lines
-	grep -v '^$'
+#set -e 
+
+read -d '' II <<EOF
+s/0\\\\{8\\\\}-0\\\\{4\\\\}-0\\\\{4\\\\}-0\\\\{4\\\\}-0\\\\{12\\\\}/!!!!/g
+s/[0-9A-F]\\\\{8\\\\}-[0-9A-F]\\\\{4\\\\}-[0-9A-F]\\\\{4\\\\}-[0-9A-F]\\\\{4\\\\}-[0-9A-F]\\\\{12\\\\}/????/g
+s/TTree [0-9]\\\\{3\\\\}[0-9]*/TTree ????/g
+s/^.*Py:Athena /Athena    /g
+s/fffffffff/f/g
+s/000000000/0/g
+s/INFO CLID = 222376821, key = Stream[12]/INFO CLID = 222376821, key = StreamX/g
+s/0x[0-9a-f]\\\\{8\\\\}/0x????/g
+EOF
+
+# Ordering sensitivities
+PP="Skipping"
+PP="$PP|using release"
+PP="$PP|Debug endTransaction:"
+PP="$PP|Deaccess DbContainer|RootDatabase.close Debug I/O|Database being retired"
+PP="$PP|^CoreDumpSvc          INFO Handling signals"
+PP="$PP|File version:"
+PP="$PP|ReadData             INFO CollectionMetadata, key = UnixTimestamp, value = "
+PP="$PP|^$"
+PP="$PP|Fd:"
+
+@toExecute@ | sed -e "$II"| egrep -v "$PP"
+