diff --git a/Control/AthenaExamples/AthExJobOptions/share/BasicJobOptions.ref b/Control/AthenaExamples/AthExJobOptions/share/BasicJobOptions.ref
index 08b25740c07b9255dbdf14bc794c2bec2b01665b..9281e75cccd3760634894bcaf0dafae6cd382024 100755
--- a/Control/AthenaExamples/AthExJobOptions/share/BasicJobOptions.ref
+++ b/Control/AthenaExamples/AthExJobOptions/share/BasicJobOptions.ref
@@ -1,20 +1,14 @@
-Fri Apr 29 10:02:21 CEST 2016
+Fri Dec 23 18:07:07 CET 2016
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AtlasTrigger-20.99.0] [x86_64-slc6-gcc49-opt] [20.99.Y-VAL/rel_4] -- built on [2016-04-27 23:34]
+Py:Athena            INFO using release [WorkDir-22.0.0] [x86_64-slc6-gcc49-dbg] [private/private] -- built on [2016-12-23 18:05]
 Py:Athena            INFO including file "AthenaCommon/Bootstrap.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
-Warning in <TInterpreter::ReadRootmapFile>: class  UCharDbArray found in libRootCnvDict.so  is already in StorageSvcDict.so 
 Py:Athena            INFO executing ROOT6Setup
 [?1034hPy:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "AthExJobOptions/AthExJobOptions_BasicJobOptions.py"
-Py:ConfigurableDb    INFO Read module info for 3386 configurables from 7 genConfDb files
-Py:ConfigurableDb WARNING Found 1 duplicates among the 7 genConfDb files :
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -<component name>: <module> - [ <duplicates> ]
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -D3PD__TrigConfMetadataTool: TrigCostD3PDMaker.TrigCostD3PDMakerConf - ['TriggerD3PDMaker.TriggerD3PDMakerConf']
-Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
+Py:ConfigurableDb    INFO Read module info for 4875 configurables from 11 genConfDb files
+Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 Py:Athena            INFO Can't set int to string property (this is correct)
 Py:Athena            INFO Can't set non-existing property (this is correct)
 /***** Algorithm AthSequencer/TopAlg ***************************************************************
@@ -38,6 +32,7 @@ Py:Athena            INFO Can't set non-existing property (this is correct)
 |-ExtraInputs               = []  (default: [])
 |-ExtraOutputs              = []  (default: [])
 |-IsClonable                = False
+|-IsIOBound                 = False
 |-Members                   = ['TopAlgorithm/TopAlgorithm', 'TopAlgorithm/MyAlg']  (default: [])
 |-MonitorService            = 'MonitorSvc'
 |-NeededResources           = []  (default: [])
@@ -70,6 +65,7 @@ Py:Athena            INFO Can't set non-existing property (this is correct)
 | |-ExtraOutputs              = []  (default: [])
 | |-InputKey                  = ''  (default: '')
 | |-IsClonable                = False
+| |-IsIOBound                 = False
 | |-MonitorService            = 'MonitorSvc'
 | |-NeededResources           = []  (default: [])
 | |-OutputKey                 = 'AAA'  (default: 'outkey')
@@ -85,97 +81,109 @@ Py:Athena            INFO Can't set non-existing property (this is correct)
 | |-Timeline                  = True
 | |-UserStore                 = ServiceHandle('UserDataSvc/UserDataSvc')
 | |=/***** Private AlgTool ToolSpace::TemplatedTool<double>/TSTT ***************************************
-| | |-AuditFinalize   = False
-| | |-AuditInitialize = False
-| | |-AuditStart      = False
-| | |-AuditStop       = False
-| | |-AuditTools      = False
-| | |-DetStore        = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore        = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs     = []  (default: [])
-| | |-ExtraOutputs    = []  (default: [])
-| | |-Factor          = 1.0
-| | |-MonitorService  = 'MonitorSvc'
-| | |-OutputLevel     = 2  (default: 7)
-| | |-UserStore       = ServiceHandle('UserDataSvc/UserDataSvc')
+| | |-AuditFinalize     = False
+| | |-AuditInitialize   = False
+| | |-AuditReinitialize = False
+| | |-AuditRestart      = False
+| | |-AuditStart        = False
+| | |-AuditStop         = False
+| | |-AuditTools        = False
+| | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs       = []  (default: [])
+| | |-ExtraOutputs      = []  (default: [])
+| | |-Factor            = 1.0
+| | |-MonitorService    = 'MonitorSvc'
+| | |-OutputLevel       = 2  (default: 0)
+| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | \----- (End of Private AlgTool ToolSpace::TemplatedTool<double>/TSTT) ------------------------------
 | |=/***** Private AlgTool ConcreteTool/Tool1 **********************************************************
-| | |-AuditFinalize   = False
-| | |-AuditInitialize = False
-| | |-AuditStart      = False
-| | |-AuditStop       = False
-| | |-AuditTools      = False
-| | |-DetStore        = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore        = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs     = []  (default: [])
-| | |-ExtraOutputs    = []  (default: [])
-| | |-Factor          = 1.0
-| | |-MonitorService  = 'MonitorSvc'
-| | |-OutputLevel     = 2  (default: 7)
-| | |-UserStore       = ServiceHandle('UserDataSvc/UserDataSvc')
+| | |-AuditFinalize     = False
+| | |-AuditInitialize   = False
+| | |-AuditReinitialize = False
+| | |-AuditRestart      = False
+| | |-AuditStart        = False
+| | |-AuditStop         = False
+| | |-AuditTools        = False
+| | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs       = []  (default: [])
+| | |-ExtraOutputs      = []  (default: [])
+| | |-Factor            = 1.0
+| | |-MonitorService    = 'MonitorSvc'
+| | |-OutputLevel       = 2  (default: 0)
+| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | \----- (End of Private AlgTool ConcreteTool/Tool1) -------------------------------------------------
 | |=/***** Private AlgTool ToolUsingTool/Tool2 *********************************************************
-| | |-AuditFinalize    = False
-| | |-AuditInitialize  = False
-| | |-AuditStart       = False
-| | |-AuditStop        = False
-| | |-AuditTools       = False
-| | |-DetStore         = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore         = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs      = []  (default: [])
-| | |-ExtraOutputs     = []  (default: [])
-| | |-Factor           = 1.0
-| | |-MonitorService   = 'MonitorSvc'
-| | |-OutputLevel      = 2  (default: 7)
-| | |-TheToolPubTool   = PublicToolHandle('ConcreteTool/PublicConcreteTool')
-| | |-TheToolTool      = PrivateToolHandle('ConcreteTool/ConcreteTool')  (default: 'ConcreteTool')
-| | |-TheToolToolArray = PrivateToolHandleArray(['ConcreteTool/CxxDefaultTool'])
-| | |-UserStore        = ServiceHandle('UserDataSvc/UserDataSvc')
+| | |-AuditFinalize     = False
+| | |-AuditInitialize   = False
+| | |-AuditReinitialize = False
+| | |-AuditRestart      = False
+| | |-AuditStart        = False
+| | |-AuditStop         = False
+| | |-AuditTools        = False
+| | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs       = []  (default: [])
+| | |-ExtraOutputs      = []  (default: [])
+| | |-Factor            = 1.0
+| | |-MonitorService    = 'MonitorSvc'
+| | |-OutputLevel       = 2  (default: 0)
+| | |-TheToolPubTool    = PublicToolHandle('ConcreteTool/PublicConcreteTool')
+| | |-TheToolTool       = PrivateToolHandle('ConcreteTool/ConcreteTool')  (default: 'ConcreteTool')
+| | |-TheToolToolArray  = PrivateToolHandleArray(['ConcreteTool/CxxDefaultTool'])
+| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | |=/***** Private AlgTool ConcreteTool/ConcreteTool ***************************************************
-| | | |-AuditFinalize   = False
-| | | |-AuditInitialize = False
-| | | |-AuditStart      = False
-| | | |-AuditStop       = False
-| | | |-AuditTools      = False
-| | | |-DetStore        = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore        = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs     = []  (default: [])
-| | | |-ExtraOutputs    = []  (default: [])
-| | | |-Factor          = 1.0
-| | | |-MonitorService  = 'MonitorSvc'
-| | | |-OutputLevel     = 2  (default: 7)
-| | | |-UserStore       = ServiceHandle('UserDataSvc/UserDataSvc')
+| | | |-AuditFinalize     = False
+| | | |-AuditInitialize   = False
+| | | |-AuditReinitialize = False
+| | | |-AuditRestart      = False
+| | | |-AuditStart        = False
+| | | |-AuditStop         = False
+| | | |-AuditTools        = False
+| | | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs       = []  (default: [])
+| | | |-ExtraOutputs      = []  (default: [])
+| | | |-Factor            = 1.0
+| | | |-MonitorService    = 'MonitorSvc'
+| | | |-OutputLevel       = 2  (default: 0)
+| | | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | | \----- (End of Private AlgTool ConcreteTool/ConcreteTool) ------------------------------------------
 | | |=/***** Private AlgTool ConcreteTool/CxxDefaultTool *************************************************
-| | | |-AuditFinalize   = False
-| | | |-AuditInitialize = False
-| | | |-AuditStart      = False
-| | | |-AuditStop       = False
-| | | |-AuditTools      = False
-| | | |-DetStore        = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore        = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs     = []  (default: [])
-| | | |-ExtraOutputs    = []  (default: [])
-| | | |-Factor          = 1.0
-| | | |-MonitorService  = 'MonitorSvc'
-| | | |-OutputLevel     = 2  (default: 7)
-| | | |-UserStore       = ServiceHandle('UserDataSvc/UserDataSvc')
+| | | |-AuditFinalize     = False
+| | | |-AuditInitialize   = False
+| | | |-AuditReinitialize = False
+| | | |-AuditRestart      = False
+| | | |-AuditStart        = False
+| | | |-AuditStop         = False
+| | | |-AuditTools        = False
+| | | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs       = []  (default: [])
+| | | |-ExtraOutputs      = []  (default: [])
+| | | |-Factor            = 1.0
+| | | |-MonitorService    = 'MonitorSvc'
+| | | |-OutputLevel       = 2  (default: 0)
+| | | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | | \----- (End of Private AlgTool ConcreteTool/CxxDefaultTool) ----------------------------------------
 | | \----- (End of Private AlgTool ToolUsingTool/Tool2) ------------------------------------------------
 | |=/***** Private AlgTool ToolSpace::TemplatedTool<double>/Tool3 **************************************
-| | |-AuditFinalize   = False
-| | |-AuditInitialize = False
-| | |-AuditStart      = False
-| | |-AuditStop       = False
-| | |-AuditTools      = False
-| | |-DetStore        = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore        = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs     = []  (default: [])
-| | |-ExtraOutputs    = []  (default: [])
-| | |-Factor          = 1.0
-| | |-MonitorService  = 'MonitorSvc'
-| | |-OutputLevel     = 2  (default: 7)
-| | |-UserStore       = ServiceHandle('UserDataSvc/UserDataSvc')
+| | |-AuditFinalize     = False
+| | |-AuditInitialize   = False
+| | |-AuditReinitialize = False
+| | |-AuditRestart      = False
+| | |-AuditStart        = False
+| | |-AuditStop         = False
+| | |-AuditTools        = False
+| | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs       = []  (default: [])
+| | |-ExtraOutputs      = []  (default: [])
+| | |-Factor            = 1.0
+| | |-MonitorService    = 'MonitorSvc'
+| | |-OutputLevel       = 2  (default: 0)
+| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | \----- (End of Private AlgTool ToolSpace::TemplatedTool<double>/Tool3) -----------------------------
 | \----- (End of Algorithm TopAlgorithm/TopAlgorithm) ------------------------------------------------
 |=/***** Algorithm TopAlgorithm/MyAlg ****************************************************************
@@ -201,6 +209,7 @@ Py:Athena            INFO Can't set non-existing property (this is correct)
 | |-ExtraOutputs              = []  (default: [])
 | |-InputKey                  = 'AAA'  (default: '')
 | |-IsClonable                = False
+| |-IsIOBound                 = False
 | |-MonitorService            = 'MonitorSvc'
 | |-NeededResources           = []  (default: [])
 | |-OutputKey                 = 'BBB'  (default: 'outkey')
@@ -217,184 +226,205 @@ Py:Athena            INFO Can't set non-existing property (this is correct)
 | |-Timeline                  = True
 | |-UserStore                 = ServiceHandle('UserDataSvc/UserDataSvc')
 | |=/***** Private AlgTool ConcreteTool/PyCT1 **********************************************************
-| | |-AuditFinalize   = False
-| | |-AuditInitialize = False
-| | |-AuditStart      = False
-| | |-AuditStop       = False
-| | |-AuditTools      = False
-| | |-DetStore        = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore        = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs     = []  (default: [])
-| | |-ExtraOutputs    = []  (default: [])
-| | |-Factor          = 1.0
-| | |-MonitorService  = 'MonitorSvc'
-| | |-OutputLevel     = 2  (default: 7)
-| | |-UserStore       = ServiceHandle('UserDataSvc/UserDataSvc')
+| | |-AuditFinalize     = False
+| | |-AuditInitialize   = False
+| | |-AuditReinitialize = False
+| | |-AuditRestart      = False
+| | |-AuditStart        = False
+| | |-AuditStop         = False
+| | |-AuditTools        = False
+| | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs       = []  (default: [])
+| | |-ExtraOutputs      = []  (default: [])
+| | |-Factor            = 1.0
+| | |-MonitorService    = 'MonitorSvc'
+| | |-OutputLevel       = 2  (default: 0)
+| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | \----- (End of Private AlgTool ConcreteTool/PyCT1) -------------------------------------------------
 | |=/***** Private AlgTool ConcreteTool/PyCT2 **********************************************************
-| | |-AuditFinalize   = False
-| | |-AuditInitialize = False
-| | |-AuditStart      = False
-| | |-AuditStop       = False
-| | |-AuditTools      = False
-| | |-DetStore        = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore        = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs     = []  (default: [])
-| | |-ExtraOutputs    = []  (default: [])
-| | |-Factor          = 1.0
-| | |-MonitorService  = 'MonitorSvc'
-| | |-OutputLevel     = 2  (default: 7)
-| | |-UserStore       = ServiceHandle('UserDataSvc/UserDataSvc')
+| | |-AuditFinalize     = False
+| | |-AuditInitialize   = False
+| | |-AuditReinitialize = False
+| | |-AuditRestart      = False
+| | |-AuditStart        = False
+| | |-AuditStop         = False
+| | |-AuditTools        = False
+| | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs       = []  (default: [])
+| | |-ExtraOutputs      = []  (default: [])
+| | |-Factor            = 1.0
+| | |-MonitorService    = 'MonitorSvc'
+| | |-OutputLevel       = 2  (default: 0)
+| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | \----- (End of Private AlgTool ConcreteTool/PyCT2) -------------------------------------------------
 | |=/***** Private AlgTool ToolSpace::TemplatedTool<double>/PyTSTT3 ************************************
-| | |-AuditFinalize   = False
-| | |-AuditInitialize = False
-| | |-AuditStart      = False
-| | |-AuditStop       = False
-| | |-AuditTools      = False
-| | |-DetStore        = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore        = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs     = []  (default: [])
-| | |-ExtraOutputs    = []  (default: [])
-| | |-Factor          = 30  (default: 1.0)
-| | |-MonitorService  = 'MonitorSvc'
-| | |-OutputLevel     = 2  (default: 7)
-| | |-UserStore       = ServiceHandle('UserDataSvc/UserDataSvc')
+| | |-AuditFinalize     = False
+| | |-AuditInitialize   = False
+| | |-AuditReinitialize = False
+| | |-AuditRestart      = False
+| | |-AuditStart        = False
+| | |-AuditStop         = False
+| | |-AuditTools        = False
+| | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs       = []  (default: [])
+| | |-ExtraOutputs      = []  (default: [])
+| | |-Factor            = 30  (default: 1.0)
+| | |-MonitorService    = 'MonitorSvc'
+| | |-OutputLevel       = 2  (default: 0)
+| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | \----- (End of Private AlgTool ToolSpace::TemplatedTool<double>/PyTSTT3) ---------------------------
 | |=/***** Private AlgTool ToolSpace::TemplatedTool<double>/PyTSTT4 ************************************
-| | |-AuditFinalize   = False
-| | |-AuditInitialize = False
-| | |-AuditStart      = False
-| | |-AuditStop       = False
-| | |-AuditTools      = False
-| | |-DetStore        = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore        = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs     = []  (default: [])
-| | |-ExtraOutputs    = []  (default: [])
-| | |-Factor          = 40  (default: 1.0)
-| | |-MonitorService  = 'MonitorSvc'
-| | |-OutputLevel     = 2  (default: 7)
-| | |-UserStore       = ServiceHandle('UserDataSvc/UserDataSvc')
+| | |-AuditFinalize     = False
+| | |-AuditInitialize   = False
+| | |-AuditReinitialize = False
+| | |-AuditRestart      = False
+| | |-AuditStart        = False
+| | |-AuditStop         = False
+| | |-AuditTools        = False
+| | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs       = []  (default: [])
+| | |-ExtraOutputs      = []  (default: [])
+| | |-Factor            = 40  (default: 1.0)
+| | |-MonitorService    = 'MonitorSvc'
+| | |-OutputLevel       = 2  (default: 0)
+| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | \----- (End of Private AlgTool ToolSpace::TemplatedTool<double>/PyTSTT4) ---------------------------
 | |=/***** Private AlgTool ToolUsingTool/Special *******************************************************
-| | |-AuditFinalize    = False
-| | |-AuditInitialize  = False
-| | |-AuditStart       = False
-| | |-AuditStop        = False
-| | |-AuditTools       = False
-| | |-DetStore         = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore         = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs      = []  (default: [])
-| | |-ExtraOutputs     = []  (default: [])
-| | |-Factor           = 37  (default: 1.0)
-| | |-MonitorService   = 'MonitorSvc'
-| | |-OutputLevel      = 2  (default: 7)
-| | |-TheToolPubTool   = PublicToolHandle('ConcreteTool/PublicConcreteTool')
-| | |-TheToolTool      = PrivateToolHandle('ToolSpace::TemplatedTool<double>/PyTSTTSp1')
-| | |                  (default: 'ConcreteTool')
-| | |-TheToolToolArray = PrivateToolHandleArray(['ConcreteTool/PySpSubTool'])
-| | |                  (default: "['ConcreteTool/CxxDefaultTool']")
-| | |-UserStore        = ServiceHandle('UserDataSvc/UserDataSvc')
+| | |-AuditFinalize     = False
+| | |-AuditInitialize   = False
+| | |-AuditReinitialize = False
+| | |-AuditRestart      = False
+| | |-AuditStart        = False
+| | |-AuditStop         = False
+| | |-AuditTools        = False
+| | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs       = []  (default: [])
+| | |-ExtraOutputs      = []  (default: [])
+| | |-Factor            = 37  (default: 1.0)
+| | |-MonitorService    = 'MonitorSvc'
+| | |-OutputLevel       = 2  (default: 0)
+| | |-TheToolPubTool    = PublicToolHandle('ConcreteTool/PublicConcreteTool')
+| | |-TheToolTool       = PrivateToolHandle('ToolSpace::TemplatedTool<double>/PyTSTTSp1')
+| | |                   (default: 'ConcreteTool')
+| | |-TheToolToolArray  = PrivateToolHandleArray(['ConcreteTool/PySpSubTool'])
+| | |                   (default: "['ConcreteTool/CxxDefaultTool']")
+| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | |=/***** Private AlgTool ConcreteTool/PySpSubTool ****************************************************
-| | | |-AuditFinalize   = False
-| | | |-AuditInitialize = False
-| | | |-AuditStart      = False
-| | | |-AuditStop       = False
-| | | |-AuditTools      = False
-| | | |-DetStore        = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore        = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs     = []  (default: [])
-| | | |-ExtraOutputs    = []  (default: [])
-| | | |-Factor          = 3.1415  (default: 1.0)
-| | | |-MonitorService  = 'MonitorSvc'
-| | | |-OutputLevel     = 2  (default: 7)
-| | | |-UserStore       = ServiceHandle('UserDataSvc/UserDataSvc')
+| | | |-AuditFinalize     = False
+| | | |-AuditInitialize   = False
+| | | |-AuditReinitialize = False
+| | | |-AuditRestart      = False
+| | | |-AuditStart        = False
+| | | |-AuditStop         = False
+| | | |-AuditTools        = False
+| | | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs       = []  (default: [])
+| | | |-ExtraOutputs      = []  (default: [])
+| | | |-Factor            = 3.1415  (default: 1.0)
+| | | |-MonitorService    = 'MonitorSvc'
+| | | |-OutputLevel       = 2  (default: 0)
+| | | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | | \----- (End of Private AlgTool ConcreteTool/PySpSubTool) -------------------------------------------
 | | |=/***** Private AlgTool ToolSpace::TemplatedTool<double>/PyTSTTSp1 **********************************
-| | | |-AuditFinalize   = False
-| | | |-AuditInitialize = False
-| | | |-AuditStart      = False
-| | | |-AuditStop       = False
-| | | |-AuditTools      = False
-| | | |-DetStore        = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore        = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs     = []  (default: [])
-| | | |-ExtraOutputs    = []  (default: [])
-| | | |-Factor          = 6.283  (default: 1.0)
-| | | |-MonitorService  = 'MonitorSvc'
-| | | |-OutputLevel     = 2  (default: 7)
-| | | |-UserStore       = ServiceHandle('UserDataSvc/UserDataSvc')
+| | | |-AuditFinalize     = False
+| | | |-AuditInitialize   = False
+| | | |-AuditReinitialize = False
+| | | |-AuditRestart      = False
+| | | |-AuditStart        = False
+| | | |-AuditStop         = False
+| | | |-AuditTools        = False
+| | | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs       = []  (default: [])
+| | | |-ExtraOutputs      = []  (default: [])
+| | | |-Factor            = 6.283  (default: 1.0)
+| | | |-MonitorService    = 'MonitorSvc'
+| | | |-OutputLevel       = 2  (default: 0)
+| | | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | | \----- (End of Private AlgTool ToolSpace::TemplatedTool<double>/PyTSTTSp1) -------------------------
 | | \----- (End of Private AlgTool ToolUsingTool/Special) ----------------------------------------------
 | |=/***** Private AlgTool ToolUsingTool/ToolUsingTool *************************************************
-| | |-AuditFinalize    = False
-| | |-AuditInitialize  = False
-| | |-AuditStart       = False
-| | |-AuditStop        = False
-| | |-AuditTools       = False
-| | |-DetStore         = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore         = ServiceHandle('StoreGateSvc')
-| | |-ExtraInputs      = []  (default: [])
-| | |-ExtraOutputs     = []  (default: [])
-| | |-Factor           = 1.0
-| | |-MonitorService   = 'MonitorSvc'
-| | |-OutputLevel      = 2  (default: 7)
-| | |-TheToolPubTool   = PublicToolHandle('ConcreteTool/PublicConcreteTool')
-| | |-TheToolTool      = PrivateToolHandle('ConcreteTool/ConcreteTool')  (default: 'ConcreteTool')
-| | |-TheToolToolArray = PrivateToolHandleArray(['ConcreteTool/CxxDefaultTool'])
-| | |-UserStore        = ServiceHandle('UserDataSvc/UserDataSvc')
+| | |-AuditFinalize     = False
+| | |-AuditInitialize   = False
+| | |-AuditReinitialize = False
+| | |-AuditRestart      = False
+| | |-AuditStart        = False
+| | |-AuditStop         = False
+| | |-AuditTools        = False
+| | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs       = []  (default: [])
+| | |-ExtraOutputs      = []  (default: [])
+| | |-Factor            = 1.0
+| | |-MonitorService    = 'MonitorSvc'
+| | |-OutputLevel       = 2  (default: 0)
+| | |-TheToolPubTool    = PublicToolHandle('ConcreteTool/PublicConcreteTool')
+| | |-TheToolTool       = PrivateToolHandle('ConcreteTool/ConcreteTool')  (default: 'ConcreteTool')
+| | |-TheToolToolArray  = PrivateToolHandleArray(['ConcreteTool/CxxDefaultTool'])
+| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | |=/***** Private AlgTool ConcreteTool/ConcreteTool ***************************************************
-| | | |-AuditFinalize   = False
-| | | |-AuditInitialize = False
-| | | |-AuditStart      = False
-| | | |-AuditStop       = False
-| | | |-AuditTools      = False
-| | | |-DetStore        = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore        = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs     = []  (default: [])
-| | | |-ExtraOutputs    = []  (default: [])
-| | | |-Factor          = 1.0
-| | | |-MonitorService  = 'MonitorSvc'
-| | | |-OutputLevel     = 2  (default: 7)
-| | | |-UserStore       = ServiceHandle('UserDataSvc/UserDataSvc')
+| | | |-AuditFinalize     = False
+| | | |-AuditInitialize   = False
+| | | |-AuditReinitialize = False
+| | | |-AuditRestart      = False
+| | | |-AuditStart        = False
+| | | |-AuditStop         = False
+| | | |-AuditTools        = False
+| | | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs       = []  (default: [])
+| | | |-ExtraOutputs      = []  (default: [])
+| | | |-Factor            = 1.0
+| | | |-MonitorService    = 'MonitorSvc'
+| | | |-OutputLevel       = 2  (default: 0)
+| | | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | | \----- (End of Private AlgTool ConcreteTool/ConcreteTool) ------------------------------------------
 | | |=/***** Private AlgTool ConcreteTool/CxxDefaultTool *************************************************
-| | | |-AuditFinalize   = False
-| | | |-AuditInitialize = False
-| | | |-AuditStart      = False
-| | | |-AuditStop       = False
-| | | |-AuditTools      = False
-| | | |-DetStore        = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore        = ServiceHandle('StoreGateSvc')
-| | | |-ExtraInputs     = []  (default: [])
-| | | |-ExtraOutputs    = []  (default: [])
-| | | |-Factor          = 1.0
-| | | |-MonitorService  = 'MonitorSvc'
-| | | |-OutputLevel     = 2  (default: 7)
-| | | |-UserStore       = ServiceHandle('UserDataSvc/UserDataSvc')
+| | | |-AuditFinalize     = False
+| | | |-AuditInitialize   = False
+| | | |-AuditReinitialize = False
+| | | |-AuditRestart      = False
+| | | |-AuditStart        = False
+| | | |-AuditStop         = False
+| | | |-AuditTools        = False
+| | | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs       = []  (default: [])
+| | | |-ExtraOutputs      = []  (default: [])
+| | | |-Factor            = 1.0
+| | | |-MonitorService    = 'MonitorSvc'
+| | | |-OutputLevel       = 2  (default: 0)
+| | | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | | \----- (End of Private AlgTool ConcreteTool/CxxDefaultTool) ----------------------------------------
 | | \----- (End of Private AlgTool ToolUsingTool/ToolUsingTool) ----------------------------------------
 | \----- (End of Algorithm TopAlgorithm/MyAlg) -------------------------------------------------------
 \----- (End of Algorithm AthSequencer/TopAlg) ------------------------------------------------------
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
+/cvmfs/sft.cern.ch/lcg/contrib/gcc/4.9.3/x86_64-slc6/include/c++/4.9.3/bits/regex.h:1545:11: runtime error: load of value 16, which is not a valid value for type 'bool'
 ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v4r1)
-                                          running on lxplus077.cern.ch on Fri Apr 29 10:02:27 2016
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v28r0)
+                                          running on lxplus019.cern.ch on Fri Dec 23 18:07:21 2016
 ====================================================================================================================================
+/cvmfs/sft.cern.ch/lcg/contrib/gcc/4.9.3/x86_64-slc6/include/c++/4.9.3/bits/regex.h:1545:11: runtime error: load of value 144, which is not a valid value for type 'bool'
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
 ApplicationMgr                     INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 StatusCodeSvc                      INFO initialize
 AthDictLoaderSvc                   INFO in initialize...
 AthDictLoaderSvc                   INFO acquired Dso-registry
-ClassIDSvc                         INFO Initializing ClassIDSvc - package version CLIDComps-00-06-19
-ClassIDSvc                         INFO  getRegistryEntries: read 2109 CLIDRegistry entries for module ALL
+ClassIDSvc                         INFO  getRegistryEntries: read 2297 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)
 CoreDumpSvc                        INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
-AthenaEventLoopMgr                 INFO Initializing AthenaEventLoopMgr - package version AthenaServices-01-60-08
+AthenaEventLoopMgr                 INFO Initializing AthenaEventLoopMgr - package version AthenaServices-01-60-45-01
 AthMasterSeq                       INFO Member list: AthSequencer/AthAlgSeq, AthSequencer/AthOutSeq, AthSequencer/AthRegSeq
 AthAlgSeq                          INFO Member list: TopAlgorithm, TopAlgorithm/MyAlg
 TopAlgorithm                      DEBUG Property update for OutputLevel : new value = 2
@@ -407,14 +437,16 @@ TopAlgorithm.Tool2.ConcreteTool   DEBUG Property update for OutputLevel : new va
 TopAlgorithm.Tool2                 INFO Retrieved TheToolTool = PrivateToolHandle('ConcreteTool/ConcreteTool')
 TopAlgorithm.Tool2.CxxDefault...  DEBUG Property update for OutputLevel : new value = 2
 TopAlgorithm.Tool2                 INFO Retrieved TheToolToolArray = PrivateToolHandleArray(['ConcreteTool/CxxDefaultTool'])
+TopAlgorithm.Tool2                DEBUG Registering all Tools in ToolHandleArray TheToolToolArray
+TopAlgorithm.Tool2                DEBUG Adding private ToolHandle tool TopAlgorithm.Tool2.CxxDefaultTool (ConcreteTool) from ToolHandleArray TheToolToolArray
+TopAlgorithm.Tool2                DEBUG Adding Public ToolHandle tool ToolSvc.PublicConcreteTool (ConcreteTool)
+TopAlgorithm.Tool2                DEBUG Adding Private ToolHandle tool TopAlgorithm.Tool2.ConcreteTool (ConcreteTool)
 TopAlgorithm.Tool3                DEBUG Property update for OutputLevel : new value = 2
 TopAlgorithm                       INFO Retrieved PrivateToolList = PrivateToolHandleArray(['ConcreteTool/Tool1','ToolUsingTool/Tool2','ToolSpace::TemplatedTool<double>/Tool3'])
 ToolSvc.Tool5                      INFO Retrieved TheToolPubTool = PublicToolHandle('ConcreteTool/PublicConcreteTool')
 ToolSvc.Tool5                      INFO Retrieved TheToolTool = PrivateToolHandle('ConcreteTool')
 ToolSvc.Tool5                      INFO Retrieved TheToolToolArray = PrivateToolHandleArray(['ConcreteTool/CxxDefaultTool'])
 TopAlgorithm                       INFO Retrieved PublicToolList = PublicToolHandleArray(['ConcreteTool/Tool4','ToolUsingTool/Tool5','ToolSpace::TemplatedTool<double>/Tool6'])
-StoreGateSvc                       INFO Initializing StoreGateSvc - package version StoreGate-03-06-37
-ProxyProviderSvc                   INFO Initializing ProxyProviderSvc - package version SGComps-00-02-07
 ConcreteSvc                        INFO Initializing ConcreteSvc...
 ConcreteSvc                        INFO Quote of the day: [Your day will be somewhat dictated by authority]
 TopAlgorithm                       INFO Retrieved TheSvc = ServiceHandle('ConcreteSvc')
@@ -442,6 +474,10 @@ MyAlg.ToolUsingTool.ConcreteTool  DEBUG Property update for OutputLevel : new va
 MyAlg.ToolUsingTool                INFO Retrieved TheToolTool = PrivateToolHandle('ConcreteTool/ConcreteTool')
 MyAlg.ToolUsingTool.CxxDefaul...  DEBUG Property update for OutputLevel : new value = 2
 MyAlg.ToolUsingTool                INFO Retrieved TheToolToolArray = PrivateToolHandleArray(['ConcreteTool/CxxDefaultTool'])
+MyAlg.ToolUsingTool               DEBUG Registering all Tools in ToolHandleArray TheToolToolArray
+MyAlg.ToolUsingTool               DEBUG Adding private ToolHandle tool MyAlg.ToolUsingTool.CxxDefaultTool (ConcreteTool) from ToolHandleArray TheToolToolArray
+MyAlg.ToolUsingTool               DEBUG Adding Public ToolHandle tool ToolSvc.PublicConcreteTool (ConcreteTool)
+MyAlg.ToolUsingTool               DEBUG Adding Private ToolHandle tool MyAlg.ToolUsingTool.ConcreteTool (ConcreteTool)
 MyAlg                              INFO Retrieved TheTool = PrivateToolHandle('ToolUsingTool/ToolUsingTool')
 MyAlg.PyCT1                       DEBUG Property update for OutputLevel : new value = 2
 MyAlg.PyCT2                       DEBUG Property update for OutputLevel : new value = 2
@@ -453,6 +489,10 @@ MyAlg.Special.PyTSTTSp1           DEBUG Property update for OutputLevel : new va
 MyAlg.Special                      INFO Retrieved TheToolTool = PrivateToolHandle('ToolSpace::TemplatedTool<double>/PyTSTTSp1')
 MyAlg.Special.PySpSubTool         DEBUG Property update for OutputLevel : new value = 2
 MyAlg.Special                      INFO Retrieved TheToolToolArray = PrivateToolHandleArray(['ConcreteTool/PySpSubTool'])
+MyAlg.Special                     DEBUG Registering all Tools in ToolHandleArray TheToolToolArray
+MyAlg.Special                     DEBUG Adding private ToolHandle tool MyAlg.Special.PySpSubTool (ConcreteTool) from ToolHandleArray TheToolToolArray
+MyAlg.Special                     DEBUG Adding Public ToolHandle tool ToolSvc.PublicConcreteTool (ConcreteTool)
+MyAlg.Special                     DEBUG Adding Private ToolHandle tool MyAlg.Special.PyTSTTSp1 (ToolSpace::TemplatedTool<double>)
 MyAlg                              INFO Retrieved PrivateToolList = PrivateToolHandleArray(['ConcreteTool/PyCT1','ConcreteTool/PyCT2','ToolSpace::TemplatedTool<double>/PyTSTT3','ToolSpace::TemplatedTool<double>/PyTSTT4','ToolUsingTool/Special'])
 MyAlg                              INFO Retrieved PublicToolList = PublicToolHandleArray(['ConcreteTool/Tool4','ToolUsingTool/Tool5','ToolSpace::TemplatedTool<double>/Tool6','ConcreteTool/PyCT5','ToolSpace::TemplatedTool<double>/PyTSTT7'])
 QotdSvc                            INFO Initializing QotdSvc...
@@ -480,9 +520,7 @@ MyAlg                             DEBUG ToolHandle  not used
 MyAlg                             DEBUG ToolHandle  not used
 MyAlg                             DEBUG Data Deps for MyAlg
 HistogramPersistencySvc         WARNING Histograms saving not required.
-ActiveStoreSvc                     INFO Initializing ActiveStoreSvc - package version StoreGate-03-06-37
 ApplicationMgr                     INFO Application Manager Initialized successfully
-StoreGateSvc                       INFO Start StoreGateSvc
 ApplicationMgr                     INFO Application Manager Started successfully
 AthenaEventLoopMgr                 INFO   ===>>>  start of run 1    <<<===
 AthenaEventLoopMgr                 INFO   ===>>>  start processing event #1, run #1 0 events processed so far  <<<===
@@ -662,8 +700,6 @@ ToolSvc.PyTSTT7                    INFO ... templated task is done
 MyAlg                              INFO ... my work is done! 
 MyAlg                             DEBUG wrote data: 1.00913e+59 for key: BBB
 AthenaEventLoopMgr                 INFO   ===>>>  done processing event #2, run #1 2 events processed so far  <<<===
-StoreGateSvc                       INFO Stop StoreGateSvc
-StoreGateSvc                       INFO stop: setting service priority to 101 so that event stores get finalized and cleared before other stores
 ApplicationMgr                     INFO Application Manager Stopped successfully
 AthAlgSeq                          INFO Finalizing AthAlgSeq...
 TopAlgorithm                      DEBUG Calling destructor
@@ -671,7 +707,6 @@ MyAlg                             DEBUG Calling destructor
 AthOutSeq                          INFO Finalizing AthOutSeq...
 AthRegSeq                          INFO Finalizing AthRegSeq...
 AthMasterSeq                       INFO Finalizing AthMasterSeq...
-StoreGateSvc                       INFO Finalizing StoreGateSvc - package version StoreGate-03-06-37
 QotdSvc                            INFO Finalizing QotdSvc...
 ConcreteSvc                        INFO Finalizing ConcreteSvc...
 AthDictLoaderSvc                   INFO in finalize...
@@ -695,7 +730,7 @@ TopAlgorithm.TSTT                 DEBUG Calling destructor
 *****Chrono*****                   INFO ****************************************************************************************************
 *****Chrono*****                   INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****                   INFO ****************************************************************************************************
-ChronoStatSvc                      INFO Time User   : Tot=  122 [ms]                                             #=  1
+ChronoStatSvc                      INFO Time User   : Tot=  400 [ms]                                             #=  1
 *****Chrono*****                   INFO ****************************************************************************************************
 ChronoStatSvc.finalize()           INFO  Service finalized successfully 
 ApplicationMgr                     INFO Application Manager Finalized successfully
diff --git a/Control/AthenaExamples/AthExJobOptions/share/CustomToolJobOptions.ref b/Control/AthenaExamples/AthExJobOptions/share/CustomToolJobOptions.ref
index c6b51f9734504cd29fde783932e13ab6b765bb1d..48bda7e6a5e2fff9873611dc98f5dbed95bdf71b 100755
--- a/Control/AthenaExamples/AthExJobOptions/share/CustomToolJobOptions.ref
+++ b/Control/AthenaExamples/AthExJobOptions/share/CustomToolJobOptions.ref
@@ -1,20 +1,15 @@
-Sat Mar 12 20:29:57 CET 2016
+Fri Dec 23 18:13:10 CET 2016
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AtlasOffline-21.0.0] [x86_64-slc6-gcc49-dbg] [21.X.Y-VAL/rel_6] -- built on [2016-03-11 22:40]
+Py:Athena            INFO using release [WorkDir-22.0.0] [x86_64-slc6-gcc49-dbg] [private/private] -- built on [2016-12-23 18:05]
 Py:Athena            INFO including file "AthenaCommon/Bootstrap.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
 [?1034hPy:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "AthExJobOptions/AthExJobOptions_CustomToolJobOptions.py"
-Py:ConfigurableDb    INFO Read module info for 5022 configurables from 10 genConfDb files
-Py:ConfigurableDb WARNING Found 1 duplicates among the 10 genConfDb files :
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -<component name>: <module> - [ <duplicates> ]
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -TrigHLTJetHypo: TrigJetHypo.TrigJetHypoConf - ['TrigHLTJetHypo.TrigHLTJetHypoConf']
-Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
-{'TheTool': <ToolUsingTool/YourTopAlg.ToolUsingTool at 0x7fe62d0b4220>, 'RndmFactor': '<no value>', 'PublicToolList': PublicToolHandleArray(['ConcreteTool/Tool4','ToolUsingTool/Tool5','ToolSpace::TemplatedTool<double>/Tool6']), 'AuditExecute': '<no value>', 'EmptyPublicTool': PublicToolHandle(''), 'AuditReinitialize': '<no value>', 'EmptyPrivateTool': PrivateToolHandle(''), 'InputKey': '<no value>', 'AuditRestart': '<no value>', 'MonitorService': '<no value>', 'Enable': '<no value>', 'UserStore': ServiceHandle('UserDataSvc/UserDataSvc'), 'AuditFinalize': '<no value>', 'PrivateToolList': PrivateToolHandleArray(['ConcreteTool/Tool1','ToolUsingTool/Tool2','ToolSpace::TemplatedTool<double>/Tool3']), 'AuditEndRun': '<no value>', 'AuditBeginRun': '<no value>', 'ErrorMax': '<no value>', 'OutputKey': '<no value>', 'AuditInitialize': '<no value>', 'OutputLevel': '<no value>', 'AuditStop': '<no value>', 'DetStore': ServiceHandle('StoreGateSvc/DetectorStore'), 'TheSvc': ServiceHandle('ConcreteSvc'), 'EvtStore': ServiceHandle('StoreGateSvc'), 'AuditStart': '<no value>', 'RegisterForContextService': '<no value>', 'AuditAlgorithms': '<no value>', 'ThePublicTool': PublicToolHandle('ConcreteTool'), 'ErrorCounter': '<no value>'}
+Py:ConfigurableDb    INFO Read module info for 4875 configurables from 11 genConfDb files
+Py:ConfigurableDb    INFO No duplicates have been found: that's good !
+{'TheTool': <ToolUsingTool/YourTopAlg.ToolUsingTool at 0x7efe8469d158>, 'ErrorMax': '<no value>', 'RndmFactor': '<no value>', 'PublicToolList': PublicToolHandleArray(['ConcreteTool/Tool4','ToolUsingTool/Tool5','ToolSpace::TemplatedTool<double>/Tool6']), 'AuditExecute': '<no value>', 'EmptyPublicTool': PublicToolHandle(''), 'AuditReinitialize': '<no value>', 'EmptyPrivateTool': PrivateToolHandle(''), 'InputKey': '<no value>', 'AuditRestart': '<no value>', 'OutputKey': '<no value>', 'MonitorService': '<no value>', 'Enable': '<no value>', 'Timeline': '<no value>', 'UserStore': ServiceHandle('UserDataSvc/UserDataSvc'), 'AuditFinalize': '<no value>', 'PrivateToolList': PrivateToolHandleArray(['ConcreteTool/Tool1','ToolUsingTool/Tool2','ToolSpace::TemplatedTool<double>/Tool3']), 'AuditEndRun': '<no value>', 'NeededResources': [], 'AuditBeginRun': '<no value>', 'Cardinality': '<no value>', 'ExtraOutputs': [], 'IsIOBound': '<no value>', 'AuditInitialize': '<no value>', 'OutputLevel': '<no value>', 'ExtraInputs': [], 'AuditStop': '<no value>', 'DetStore': ServiceHandle('StoreGateSvc/DetectorStore'), 'TheSvc': ServiceHandle('ConcreteSvc'), 'EvtStore': ServiceHandle('StoreGateSvc'), 'AuditStart': '<no value>', 'RegisterForContextService': '<no value>', 'AuditAlgorithms': '<no value>', 'IsClonable': '<no value>', 'ThePublicTool': PublicToolHandle('ConcreteTool'), 'ErrorCounter': '<no value>'}
 /***** Algorithm AthSequencer/TopAlg ***************************************************************
 |-AuditAlgorithms           = False
 |-AuditBeginRun             = False
@@ -26,18 +21,25 @@ Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
 |-AuditRestart              = False
 |-AuditStart                = False
 |-AuditStop                 = False
+|-Cardinality               = 1
 |-ContinueEventloopOnFPE    = False
 |-DetStore                  = ServiceHandle('StoreGateSvc/DetectorStore')
 |-Enable                    = True
 |-ErrorCounter              = 0
 |-ErrorMax                  = 1
 |-EvtStore                  = ServiceHandle('StoreGateSvc')
+|-ExtraInputs               = []  (default: [])
+|-ExtraOutputs              = []  (default: [])
+|-IsClonable                = False
+|-IsIOBound                 = False
 |-Members                   = ['TopAlgorithm/MyTopAlg', 'TopAlgorithm/YourTopAlg']  (default: [])
 |-MonitorService            = 'MonitorSvc'
+|-NeededResources           = []  (default: [])
 |-OutputLevel               = 0
 |-RegisterForContextService = False
 |-StopOverride              = False
 |-TimeOut                   = 0.0
+|-Timeline                  = True
 |-UserStore                 = ServiceHandle('UserDataSvc/UserDataSvc')
 |=/***** Algorithm TopAlgorithm/MyTopAlg *************************************************************
 | |-AuditAlgorithms           = False
@@ -50,6 +52,7 @@ Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
 | |-AuditRestart              = False
 | |-AuditStart                = False
 | |-AuditStop                 = False
+| |-Cardinality               = 1
 | |-DetStore                  = ServiceHandle('StoreGateSvc/DetectorStore')
 | |-EmptyPrivateTool          = PrivateToolHandle('')
 | |-EmptyPublicTool           = PublicToolHandle('')
@@ -57,8 +60,13 @@ Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
 | |-ErrorCounter              = 0
 | |-ErrorMax                  = 1
 | |-EvtStore                  = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs               = []  (default: [])
+| |-ExtraOutputs              = []  (default: [])
 | |-InputKey                  = ''
+| |-IsClonable                = False
+| |-IsIOBound                 = False
 | |-MonitorService            = 'MonitorSvc'
+| |-NeededResources           = []  (default: [])
 | |-OutputKey                 = 'outkey'
 | |-OutputLevel               = 0
 | |-PrivateToolList           = PrivateToolHandleArray(['ConcreteTool/Tool1','ToolUsingTool/Tool2','ToolSpace::TemplatedTool<double>/Tool3'])
@@ -68,47 +76,60 @@ Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
 | |-ThePublicTool             = PublicToolHandle('ConcreteTool')
 | |-TheSvc                    = ServiceHandle('ConcreteSvc')
 | |-TheTool                   = PrivateToolHandle('ToolUsingTool/CustomTool')  (default: 'ToolUsingTool')
+| |-Timeline                  = True
 | |-UserStore                 = ServiceHandle('UserDataSvc/UserDataSvc')
 | |=/***** Private AlgTool ToolUsingTool/CustomTool ****************************************************
-| | |-AuditFinalize    = False
-| | |-AuditInitialize  = False
-| | |-AuditStart       = False
-| | |-AuditStop        = False
-| | |-AuditTools       = False
-| | |-DetStore         = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore         = ServiceHandle('StoreGateSvc')
-| | |-Factor           = 14.0  (default: 42.0)
-| | |-MonitorService   = 'MonitorSvc'
-| | |-OutputLevel      = 7
-| | |-TheToolPubTool   = PublicToolHandle('ConcreteTool/PublicConcreteTool')
-| | |-TheToolTool      = PrivateToolHandle('ConcreteTool/ToolTool')
-| | |-TheToolToolArray = PrivateToolHandleArray(['ConcreteTool/CxxDefaultTool'])
-| | |-UserStore        = ServiceHandle('UserDataSvc/UserDataSvc')
+| | |-AuditFinalize     = False
+| | |-AuditInitialize   = False
+| | |-AuditReinitialize = False
+| | |-AuditRestart      = False
+| | |-AuditStart        = False
+| | |-AuditStop         = False
+| | |-AuditTools        = False
+| | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs       = []  (default: [])
+| | |-ExtraOutputs      = []  (default: [])
+| | |-Factor            = 14.0  (default: 42.0)
+| | |-MonitorService    = 'MonitorSvc'
+| | |-OutputLevel       = 0
+| | |-TheToolPubTool    = PublicToolHandle('ConcreteTool/PublicConcreteTool')
+| | |-TheToolTool       = PrivateToolHandle('ConcreteTool/ToolTool')
+| | |-TheToolToolArray  = PrivateToolHandleArray(['ConcreteTool/CxxDefaultTool'])
+| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | |=/***** Private AlgTool ConcreteTool/CxxDefaultTool *************************************************
-| | | |-AuditFinalize   = False
-| | | |-AuditInitialize = False
-| | | |-AuditStart      = False
-| | | |-AuditStop       = False
-| | | |-AuditTools      = False
-| | | |-DetStore        = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore        = ServiceHandle('StoreGateSvc')
-| | | |-Factor          = 1.0
-| | | |-MonitorService  = 'MonitorSvc'
-| | | |-OutputLevel     = 7
-| | | |-UserStore       = ServiceHandle('UserDataSvc/UserDataSvc')
+| | | |-AuditFinalize     = False
+| | | |-AuditInitialize   = False
+| | | |-AuditReinitialize = False
+| | | |-AuditRestart      = False
+| | | |-AuditStart        = False
+| | | |-AuditStop         = False
+| | | |-AuditTools        = False
+| | | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs       = []  (default: [])
+| | | |-ExtraOutputs      = []  (default: [])
+| | | |-Factor            = 1.0
+| | | |-MonitorService    = 'MonitorSvc'
+| | | |-OutputLevel       = 0
+| | | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | | \----- (End of Private AlgTool ConcreteTool/CxxDefaultTool) ----------------------------------------
 | | |=/***** Private AlgTool ConcreteTool/ToolTool *******************************************************
-| | | |-AuditFinalize   = False
-| | | |-AuditInitialize = False
-| | | |-AuditStart      = False
-| | | |-AuditStop       = False
-| | | |-AuditTools      = False
-| | | |-DetStore        = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore        = ServiceHandle('StoreGateSvc')
-| | | |-Factor          = 1.0
-| | | |-MonitorService  = 'MonitorSvc'
-| | | |-OutputLevel     = 7
-| | | |-UserStore       = ServiceHandle('UserDataSvc/UserDataSvc')
+| | | |-AuditFinalize     = False
+| | | |-AuditInitialize   = False
+| | | |-AuditReinitialize = False
+| | | |-AuditRestart      = False
+| | | |-AuditStart        = False
+| | | |-AuditStop         = False
+| | | |-AuditTools        = False
+| | | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs       = []  (default: [])
+| | | |-ExtraOutputs      = []  (default: [])
+| | | |-Factor            = 1.0
+| | | |-MonitorService    = 'MonitorSvc'
+| | | |-OutputLevel       = 0
+| | | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | | \----- (End of Private AlgTool ConcreteTool/ToolTool) ----------------------------------------------
 | | \----- (End of Private AlgTool ToolUsingTool/CustomTool) -------------------------------------------
 | \----- (End of Algorithm TopAlgorithm/MyTopAlg) ----------------------------------------------------
@@ -123,6 +144,7 @@ Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
 | |-AuditRestart              = False
 | |-AuditStart                = False
 | |-AuditStop                 = False
+| |-Cardinality               = 1
 | |-DetStore                  = ServiceHandle('StoreGateSvc/DetectorStore')
 | |-EmptyPrivateTool          = PrivateToolHandle('')
 | |-EmptyPublicTool           = PublicToolHandle('')
@@ -130,8 +152,13 @@ Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
 | |-ErrorCounter              = 0
 | |-ErrorMax                  = 1
 | |-EvtStore                  = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs               = []  (default: [])
+| |-ExtraOutputs              = []  (default: [])
 | |-InputKey                  = ''
+| |-IsClonable                = False
+| |-IsIOBound                 = False
 | |-MonitorService            = 'MonitorSvc'
+| |-NeededResources           = []  (default: [])
 | |-OutputKey                 = 'YourKey'  (default: 'outkey')
 | |-OutputLevel               = 0
 | |-PrivateToolList           = PrivateToolHandleArray(['ConcreteTool/Tool1','ToolUsingTool/Tool2','ToolSpace::TemplatedTool<double>/Tool3'])
@@ -141,138 +168,172 @@ Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
 | |-ThePublicTool             = PublicToolHandle('ConcreteTool')
 | |-TheSvc                    = ServiceHandle('ConcreteSvc')
 | |-TheTool                   = PrivateToolHandle('ToolUsingTool/CustomTool2')  (default: 'ToolUsingTool')
+| |-Timeline                  = True
 | |-UserStore                 = ServiceHandle('UserDataSvc/UserDataSvc')
 | |=/***** Private AlgTool ToolUsingTool/CustomTool2 ***************************************************
-| | |-AuditFinalize    = False
-| | |-AuditInitialize  = False
-| | |-AuditStart       = False
-| | |-AuditStop        = False
-| | |-AuditTools       = False
-| | |-DetStore         = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore         = ServiceHandle('StoreGateSvc')
-| | |-Factor           = 18.0  (default: 1.0)
-| | |-MonitorService   = 'MonitorSvc'
-| | |-OutputLevel      = 7
-| | |-TheToolPubTool   = PublicToolHandle('ConcreteTool/PublicConcreteTool')
-| | |-TheToolTool      = PrivateToolHandle('ConcreteTool/ToolTool')  (default: 'ConcreteTool')
-| | |-TheToolToolArray = PrivateToolHandleArray(['ConcreteTool/CxxDefaultTool'])
-| | |-UserStore        = ServiceHandle('UserDataSvc/UserDataSvc')
+| | |-AuditFinalize     = False
+| | |-AuditInitialize   = False
+| | |-AuditReinitialize = False
+| | |-AuditRestart      = False
+| | |-AuditStart        = False
+| | |-AuditStop         = False
+| | |-AuditTools        = False
+| | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs       = []  (default: [])
+| | |-ExtraOutputs      = []  (default: [])
+| | |-Factor            = 18.0  (default: 1.0)
+| | |-MonitorService    = 'MonitorSvc'
+| | |-OutputLevel       = 0
+| | |-TheToolPubTool    = PublicToolHandle('ConcreteTool/PublicConcreteTool')
+| | |-TheToolTool       = PrivateToolHandle('ConcreteTool/ToolTool')  (default: 'ConcreteTool')
+| | |-TheToolToolArray  = PrivateToolHandleArray(['ConcreteTool/CxxDefaultTool'])
+| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | |=/***** Private AlgTool ConcreteTool/CxxDefaultTool *************************************************
-| | | |-AuditFinalize   = False
-| | | |-AuditInitialize = False
-| | | |-AuditStart      = False
-| | | |-AuditStop       = False
-| | | |-AuditTools      = False
-| | | |-DetStore        = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore        = ServiceHandle('StoreGateSvc')
-| | | |-Factor          = 1.0
-| | | |-MonitorService  = 'MonitorSvc'
-| | | |-OutputLevel     = 7
-| | | |-UserStore       = ServiceHandle('UserDataSvc/UserDataSvc')
+| | | |-AuditFinalize     = False
+| | | |-AuditInitialize   = False
+| | | |-AuditReinitialize = False
+| | | |-AuditRestart      = False
+| | | |-AuditStart        = False
+| | | |-AuditStop         = False
+| | | |-AuditTools        = False
+| | | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs       = []  (default: [])
+| | | |-ExtraOutputs      = []  (default: [])
+| | | |-Factor            = 1.0
+| | | |-MonitorService    = 'MonitorSvc'
+| | | |-OutputLevel       = 0
+| | | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | | \----- (End of Private AlgTool ConcreteTool/CxxDefaultTool) ----------------------------------------
 | | |=/***** Private AlgTool ConcreteTool/ToolTool *******************************************************
-| | | |-AuditFinalize   = False
-| | | |-AuditInitialize = False
-| | | |-AuditStart      = False
-| | | |-AuditStop       = False
-| | | |-AuditTools      = False
-| | | |-DetStore        = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore        = ServiceHandle('StoreGateSvc')
-| | | |-Factor          = 1.0
-| | | |-MonitorService  = 'MonitorSvc'
-| | | |-OutputLevel     = 7
-| | | |-UserStore       = ServiceHandle('UserDataSvc/UserDataSvc')
+| | | |-AuditFinalize     = False
+| | | |-AuditInitialize   = False
+| | | |-AuditReinitialize = False
+| | | |-AuditRestart      = False
+| | | |-AuditStart        = False
+| | | |-AuditStop         = False
+| | | |-AuditTools        = False
+| | | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs       = []  (default: [])
+| | | |-ExtraOutputs      = []  (default: [])
+| | | |-Factor            = 1.0
+| | | |-MonitorService    = 'MonitorSvc'
+| | | |-OutputLevel       = 0
+| | | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | | \----- (End of Private AlgTool ConcreteTool/ToolTool) ----------------------------------------------
 | | \----- (End of Private AlgTool ToolUsingTool/CustomTool2) ------------------------------------------
 | |=/***** Private AlgTool ConcreteTool/Tool1 **********************************************************
-| | |-AuditFinalize   = False
-| | |-AuditInitialize = False
-| | |-AuditStart      = False
-| | |-AuditStop       = False
-| | |-AuditTools      = False
-| | |-DetStore        = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore        = ServiceHandle('StoreGateSvc')
-| | |-Factor          = 1.0
-| | |-MonitorService  = 'MonitorSvc'
-| | |-OutputLevel     = 7
-| | |-UserStore       = ServiceHandle('UserDataSvc/UserDataSvc')
+| | |-AuditFinalize     = False
+| | |-AuditInitialize   = False
+| | |-AuditReinitialize = False
+| | |-AuditRestart      = False
+| | |-AuditStart        = False
+| | |-AuditStop         = False
+| | |-AuditTools        = False
+| | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs       = []  (default: [])
+| | |-ExtraOutputs      = []  (default: [])
+| | |-Factor            = 1.0
+| | |-MonitorService    = 'MonitorSvc'
+| | |-OutputLevel       = 0
+| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | \----- (End of Private AlgTool ConcreteTool/Tool1) -------------------------------------------------
 | |=/***** Private AlgTool ToolUsingTool/Tool2 *********************************************************
-| | |-AuditFinalize    = False
-| | |-AuditInitialize  = False
-| | |-AuditStart       = False
-| | |-AuditStop        = False
-| | |-AuditTools       = False
-| | |-DetStore         = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore         = ServiceHandle('StoreGateSvc')
-| | |-Factor           = 1.0
-| | |-MonitorService   = 'MonitorSvc'
-| | |-OutputLevel      = 7
-| | |-TheToolPubTool   = PublicToolHandle('ConcreteTool/PublicConcreteTool')
-| | |-TheToolTool      = PrivateToolHandle('ConcreteTool/ConcreteTool')  (default: 'ConcreteTool')
-| | |-TheToolToolArray = PrivateToolHandleArray(['ConcreteTool/CxxDefaultTool'])
-| | |-UserStore        = ServiceHandle('UserDataSvc/UserDataSvc')
+| | |-AuditFinalize     = False
+| | |-AuditInitialize   = False
+| | |-AuditReinitialize = False
+| | |-AuditRestart      = False
+| | |-AuditStart        = False
+| | |-AuditStop         = False
+| | |-AuditTools        = False
+| | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs       = []  (default: [])
+| | |-ExtraOutputs      = []  (default: [])
+| | |-Factor            = 1.0
+| | |-MonitorService    = 'MonitorSvc'
+| | |-OutputLevel       = 0
+| | |-TheToolPubTool    = PublicToolHandle('ConcreteTool/PublicConcreteTool')
+| | |-TheToolTool       = PrivateToolHandle('ConcreteTool/ConcreteTool')  (default: 'ConcreteTool')
+| | |-TheToolToolArray  = PrivateToolHandleArray(['ConcreteTool/CxxDefaultTool'])
+| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | |=/***** Private AlgTool ConcreteTool/ConcreteTool ***************************************************
-| | | |-AuditFinalize   = False
-| | | |-AuditInitialize = False
-| | | |-AuditStart      = False
-| | | |-AuditStop       = False
-| | | |-AuditTools      = False
-| | | |-DetStore        = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore        = ServiceHandle('StoreGateSvc')
-| | | |-Factor          = 1.0
-| | | |-MonitorService  = 'MonitorSvc'
-| | | |-OutputLevel     = 7
-| | | |-UserStore       = ServiceHandle('UserDataSvc/UserDataSvc')
+| | | |-AuditFinalize     = False
+| | | |-AuditInitialize   = False
+| | | |-AuditReinitialize = False
+| | | |-AuditRestart      = False
+| | | |-AuditStart        = False
+| | | |-AuditStop         = False
+| | | |-AuditTools        = False
+| | | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs       = []  (default: [])
+| | | |-ExtraOutputs      = []  (default: [])
+| | | |-Factor            = 1.0
+| | | |-MonitorService    = 'MonitorSvc'
+| | | |-OutputLevel       = 0
+| | | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | | \----- (End of Private AlgTool ConcreteTool/ConcreteTool) ------------------------------------------
 | | |=/***** Private AlgTool ConcreteTool/CxxDefaultTool *************************************************
-| | | |-AuditFinalize   = False
-| | | |-AuditInitialize = False
-| | | |-AuditStart      = False
-| | | |-AuditStop       = False
-| | | |-AuditTools      = False
-| | | |-DetStore        = ServiceHandle('StoreGateSvc/DetectorStore')
-| | | |-EvtStore        = ServiceHandle('StoreGateSvc')
-| | | |-Factor          = 1.0
-| | | |-MonitorService  = 'MonitorSvc'
-| | | |-OutputLevel     = 7
-| | | |-UserStore       = ServiceHandle('UserDataSvc/UserDataSvc')
+| | | |-AuditFinalize     = False
+| | | |-AuditInitialize   = False
+| | | |-AuditReinitialize = False
+| | | |-AuditRestart      = False
+| | | |-AuditStart        = False
+| | | |-AuditStop         = False
+| | | |-AuditTools        = False
+| | | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | | |-ExtraInputs       = []  (default: [])
+| | | |-ExtraOutputs      = []  (default: [])
+| | | |-Factor            = 1.0
+| | | |-MonitorService    = 'MonitorSvc'
+| | | |-OutputLevel       = 0
+| | | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | | \----- (End of Private AlgTool ConcreteTool/CxxDefaultTool) ----------------------------------------
 | | \----- (End of Private AlgTool ToolUsingTool/Tool2) ------------------------------------------------
 | |=/***** Private AlgTool ToolSpace::TemplatedTool<double>/Tool3 **************************************
-| | |-AuditFinalize   = False
-| | |-AuditInitialize = False
-| | |-AuditStart      = False
-| | |-AuditStop       = False
-| | |-AuditTools      = False
-| | |-DetStore        = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore        = ServiceHandle('StoreGateSvc')
-| | |-Factor          = 1.0
-| | |-MonitorService  = 'MonitorSvc'
-| | |-OutputLevel     = 7
-| | |-UserStore       = ServiceHandle('UserDataSvc/UserDataSvc')
+| | |-AuditFinalize     = False
+| | |-AuditInitialize   = False
+| | |-AuditReinitialize = False
+| | |-AuditRestart      = False
+| | |-AuditStart        = False
+| | |-AuditStop         = False
+| | |-AuditTools        = False
+| | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs       = []  (default: [])
+| | |-ExtraOutputs      = []  (default: [])
+| | |-Factor            = 1.0
+| | |-MonitorService    = 'MonitorSvc'
+| | |-OutputLevel       = 0
+| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | \----- (End of Private AlgTool ToolSpace::TemplatedTool<double>/Tool3) -----------------------------
 | \----- (End of Algorithm TopAlgorithm/YourTopAlg) --------------------------------------------------
 \----- (End of Algorithm AthSequencer/TopAlg) ------------------------------------------------------
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
+/cvmfs/sft.cern.ch/lcg/contrib/gcc/4.9.3/x86_64-slc6/include/c++/4.9.3/bits/regex.h:1545:11: runtime error: load of value 144, which is not a valid value for type 'bool'
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v3r4)
-                                          running on lxplus031.cern.ch on Sat Mar 12 20:30:05 2016
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v28r0)
+                                          running on lxplus019.cern.ch on Fri Dec 23 18:13:22 2016
 ====================================================================================================================================
+/cvmfs/sft.cern.ch/lcg/contrib/gcc/4.9.3/x86_64-slc6/include/c++/4.9.3/bits/regex.h:1545:11: runtime error: load of value 16, which is not a valid value for type 'bool'
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
-ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 StatusCodeSvc        INFO initialize
 AthDictLoaderSvc     INFO in initialize...
 AthDictLoaderSvc     INFO acquired Dso-registry
-ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-06-19
-ClassIDSvc           INFO  getRegistryEntries: read 2109 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 2297 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)
 CoreDumpSvc          INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
-AthenaEventLoopMgr   INFO Initializing AthenaEventLoopMgr - package version AthenaServices-01-60-02
+AthenaEventLoopMgr   INFO Initializing AthenaEventLoopMgr - package version AthenaServices-01-60-45-01
 AthMasterSeq         INFO Member list: AthSequencer/AthAlgSeq, AthSequencer/AthOutSeq, AthSequencer/AthRegSeq
 AthAlgSeq            INFO Member list: TopAlgorithm/MyTopAlg, TopAlgorithm/YourTopAlg
 MyTopAlg.Custom...   INFO Retrieved TheToolPubTool = PublicToolHandle('ConcreteTool/PublicConcreteTool')
@@ -287,8 +348,6 @@ ToolSvc.Tool5        INFO Retrieved TheToolPubTool = PublicToolHandle('ConcreteT
 ToolSvc.Tool5        INFO Retrieved TheToolTool = PrivateToolHandle('ConcreteTool')
 ToolSvc.Tool5        INFO Retrieved TheToolToolArray = PrivateToolHandleArray(['ConcreteTool/CxxDefaultTool'])
 MyTopAlg             INFO Retrieved PublicToolList = PublicToolHandleArray(['ConcreteTool/Tool4','ToolUsingTool/Tool5','ToolSpace::TemplatedTool<double>/Tool6'])
-StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-03-06-31
-ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-02-07
 ConcreteSvc          INFO Initializing ConcreteSvc...
 ConcreteSvc          INFO Quote of the day: [Your day will be somewhat dictated by authority]
 MyTopAlg             INFO Retrieved TheSvc = ServiceHandle('ConcreteSvc')
@@ -307,9 +366,7 @@ YourTopAlg           INFO Retrieved TheSvc = ServiceHandle('ConcreteSvc')
 YourTopAlg           INFO Empty private tool is empty (OK)
 YourTopAlg           INFO Empty public tool is empty (OK)
 HistogramPersis...WARNING Histograms saving not required.
-ActiveStoreSvc       INFO Initializing ActiveStoreSvc - package version StoreGate-03-06-31
 ApplicationMgr       INFO Application Manager Initialized successfully
-StoreGateSvc         INFO Start StoreGateSvc
 ApplicationMgr       INFO Application Manager Started successfully
 AthenaEventLoopMgr   INFO   ===>>>  start of run 1    <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #1, run #1 0 events processed so far  <<<===
@@ -459,21 +516,18 @@ ToolSvc.Tool6        INFO performing templated task factor ( 1) ...
 ToolSvc.Tool6        INFO ... templated task is done
 YourTopAlg           INFO ... my work is done! 
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #2, run #1 2 events processed so far  <<<===
-StoreGateSvc         INFO Stop StoreGateSvc
-StoreGateSvc         INFO stop: setting service priority to 101 so that event stores get finalized and cleared before other stores
 ApplicationMgr       INFO Application Manager Stopped successfully
 AthAlgSeq            INFO Finalizing AthAlgSeq...
 AthOutSeq            INFO Finalizing AthOutSeq...
 AthRegSeq            INFO Finalizing AthRegSeq...
 AthMasterSeq         INFO Finalizing AthMasterSeq...
-StoreGateSvc         INFO Finalizing StoreGateSvc - package version StoreGate-03-06-31
 ConcreteSvc          INFO Finalizing ConcreteSvc...
 AthDictLoaderSvc     INFO in finalize...
 ToolSvc              INFO Removing all tools created by ToolSvc
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
-ChronoStatSvc        INFO Time User   : Tot=  108 [ms]                                             #=  1
+ChronoStatSvc        INFO Time User   : Tot=  290 [ms]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/Control/AthenaExamples/AthExJobOptions/share/CustomTopAlgorithmJobOptions.ref b/Control/AthenaExamples/AthExJobOptions/share/CustomTopAlgorithmJobOptions.ref
index b98f9144fbec52a9216772db759dd1effeb8bc7d..76a1920facaa8ce336d7331f49c8289015773787 100755
--- a/Control/AthenaExamples/AthExJobOptions/share/CustomTopAlgorithmJobOptions.ref
+++ b/Control/AthenaExamples/AthExJobOptions/share/CustomTopAlgorithmJobOptions.ref
@@ -1,7 +1,7 @@
-Sat Mar 12 20:30:30 CET 2016
+Fri Dec 23 18:10:46 CET 2016
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AtlasOffline-21.0.0] [x86_64-slc6-gcc49-dbg] [21.X.Y-VAL/rel_6] -- built on [2016-03-11 22:40]
+Py:Athena            INFO using release [WorkDir-22.0.0] [x86_64-slc6-gcc49-dbg] [private/private] -- built on [2016-12-23 18:05]
 Py:Athena            INFO including file "AthenaCommon/Bootstrap.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
 Py:Athena            INFO executing ROOT6Setup
@@ -18,18 +18,25 @@ Py:Athena            INFO including file "AthExJobOptions/AthExJobOptions_Custom
 |-AuditRestart              = False
 |-AuditStart                = False
 |-AuditStop                 = False
+|-Cardinality               = 1
 |-ContinueEventloopOnFPE    = False
 |-DetStore                  = ServiceHandle('StoreGateSvc/DetectorStore')
 |-Enable                    = True
 |-ErrorCounter              = 0
 |-ErrorMax                  = 1
 |-EvtStore                  = ServiceHandle('StoreGateSvc')
+|-ExtraInputs               = []  (default: [])
+|-ExtraOutputs              = []  (default: [])
+|-IsClonable                = False
+|-IsIOBound                 = False
 |-Members                   = ['TopAlgorithm/MyCustomAlg']  (default: [])
 |-MonitorService            = 'MonitorSvc'
+|-NeededResources           = []  (default: [])
 |-OutputLevel               = 0
 |-RegisterForContextService = False
 |-StopOverride              = False
 |-TimeOut                   = 0.0
+|-Timeline                  = True
 |-UserStore                 = ServiceHandle('UserDataSvc/UserDataSvc')
 |=/***** Algorithm TopAlgorithm/MyCustomAlg **********************************************************
 | |-AuditAlgorithms           = False
@@ -42,6 +49,7 @@ Py:Athena            INFO including file "AthExJobOptions/AthExJobOptions_Custom
 | |-AuditRestart              = False
 | |-AuditStart                = False
 | |-AuditStop                 = False
+| |-Cardinality               = 1
 | |-DetStore                  = ServiceHandle('StoreGateSvc/DetectorStore')
 | |-EmptyPrivateTool          = PrivateToolHandle('')
 | |-EmptyPublicTool           = PublicToolHandle('')
@@ -49,8 +57,13 @@ Py:Athena            INFO including file "AthExJobOptions/AthExJobOptions_Custom
 | |-ErrorCounter              = 0
 | |-ErrorMax                  = 1
 | |-EvtStore                  = ServiceHandle('StoreGateSvc')
+| |-ExtraInputs               = []  (default: [])
+| |-ExtraOutputs              = []  (default: [])
 | |-InputKey                  = ''
+| |-IsClonable                = False
+| |-IsIOBound                 = False
 | |-MonitorService            = 'MonitorSvc'
+| |-NeededResources           = []  (default: [])
 | |-OutputKey                 = 'outkey'
 | |-OutputLevel               = 0
 | |-PrivateToolList           = PrivateToolHandleArray(['ConcreteTool/Tool1','ToolUsingTool/Tool2','ToolSpace::TemplatedTool<double>/Tool3'])
@@ -60,48 +73,49 @@ Py:Athena            INFO including file "AthExJobOptions/AthExJobOptions_Custom
 | |-ThePublicTool             = PublicToolHandle('ConcreteTool')
 | |-TheSvc                    = ServiceHandle('ConcreteSvc')
 | |-TheTool                   = PrivateToolHandle('ConcreteTool/ConcreteTool')
+| |-Timeline                  = True
 | |-UserStore                 = ServiceHandle('UserDataSvc/UserDataSvc')
 | |=/***** Private AlgTool ConcreteTool/ConcreteTool ***************************************************
-| | |-AuditFinalize   = False
-| | |-AuditInitialize = False
-| | |-AuditStart      = False
-| | |-AuditStop       = False
-| | |-AuditTools      = False
-| | |-DetStore        = ServiceHandle('StoreGateSvc/DetectorStore')
-| | |-EvtStore        = ServiceHandle('StoreGateSvc')
-| | |-Factor          = 1.0
-| | |-MonitorService  = 'MonitorSvc'
-| | |-OutputLevel     = 7
-| | |-UserStore       = ServiceHandle('UserDataSvc/UserDataSvc')
+| | |-AuditFinalize     = False
+| | |-AuditInitialize   = False
+| | |-AuditReinitialize = False
+| | |-AuditRestart      = False
+| | |-AuditStart        = False
+| | |-AuditStop         = False
+| | |-AuditTools        = False
+| | |-DetStore          = ServiceHandle('StoreGateSvc/DetectorStore')
+| | |-EvtStore          = ServiceHandle('StoreGateSvc')
+| | |-ExtraInputs       = []  (default: [])
+| | |-ExtraOutputs      = []  (default: [])
+| | |-Factor            = 1.0
+| | |-MonitorService    = 'MonitorSvc'
+| | |-OutputLevel       = 0
+| | |-UserStore         = ServiceHandle('UserDataSvc/UserDataSvc')
 | | \----- (End of Private AlgTool ConcreteTool/ConcreteTool) ------------------------------------------
 | \----- (End of Algorithm TopAlgorithm/MyCustomAlg) -------------------------------------------------
 \----- (End of Algorithm AthSequencer/TopAlg) ------------------------------------------------------
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
-Py:ConfigurableDb    INFO Read module info for 5022 configurables from 10 genConfDb files
-Py:ConfigurableDb WARNING Found 1 duplicates among the 10 genConfDb files :
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -<component name>: <module> - [ <duplicates> ]
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -TrigHLTJetHypo: TrigJetHypo.TrigJetHypoConf - ['TrigHLTJetHypo.TrigHLTJetHypoConf']
-Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
-ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
+Py:ConfigurableDb    INFO Read module info for 4875 configurables from 11 genConfDb files
+Py:ConfigurableDb    INFO No duplicates have been found: that's good !
+/cvmfs/sft.cern.ch/lcg/contrib/gcc/4.9.3/x86_64-slc6/include/c++/4.9.3/bits/regex.h:1545:11: runtime error: load of value 192, which is not a valid value for type 'bool'
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v3r4)
-                                          running on lxplus031.cern.ch on Sat Mar 12 20:30:37 2016
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v28r0)
+                                          running on lxplus019.cern.ch on Fri Dec 23 18:10:58 2016
 ====================================================================================================================================
+/cvmfs/sft.cern.ch/lcg/contrib/gcc/4.9.3/x86_64-slc6/include/c++/4.9.3/bits/regex.h:1545:11: runtime error: load of value 64, which is not a valid value for type 'bool'
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
-ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 StatusCodeSvc        INFO initialize
 AthDictLoaderSvc     INFO in initialize...
 AthDictLoaderSvc     INFO acquired Dso-registry
-ClassIDSvc           INFO Initializing ClassIDSvc - package version CLIDComps-00-06-19
-ClassIDSvc           INFO  getRegistryEntries: read 2109 CLIDRegistry entries for module ALL
+ClassIDSvc           INFO  getRegistryEntries: read 2297 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)
 CoreDumpSvc          INFO Handling signals: 11(Segmentation fault) 7(Bus error) 4(Illegal instruction) 8(Floating point exception) 
-AthenaEventLoopMgr   INFO Initializing AthenaEventLoopMgr - package version AthenaServices-01-60-02
+AthenaEventLoopMgr   INFO Initializing AthenaEventLoopMgr - package version AthenaServices-01-60-45-01
 AthMasterSeq         INFO Member list: AthSequencer/AthAlgSeq, AthSequencer/AthOutSeq, AthSequencer/AthRegSeq
 AthAlgSeq            INFO Member list: TopAlgorithm/MyCustomAlg
 MyCustomAlg          INFO Retrieved TheTool = PrivateToolHandle('ConcreteTool/ConcreteTool')
@@ -113,17 +127,13 @@ ToolSvc.Tool5        INFO Retrieved TheToolPubTool = PublicToolHandle('ConcreteT
 ToolSvc.Tool5        INFO Retrieved TheToolTool = PrivateToolHandle('ConcreteTool')
 ToolSvc.Tool5        INFO Retrieved TheToolToolArray = PrivateToolHandleArray(['ConcreteTool/CxxDefaultTool'])
 MyCustomAlg          INFO Retrieved PublicToolList = PublicToolHandleArray(['ConcreteTool/Tool4','ToolUsingTool/Tool5','ToolSpace::TemplatedTool<double>/Tool6'])
-StoreGateSvc         INFO Initializing StoreGateSvc - package version StoreGate-03-06-31
-ProxyProviderSvc     INFO Initializing ProxyProviderSvc - package version SGComps-00-02-07
 ConcreteSvc          INFO Initializing ConcreteSvc...
 ConcreteSvc          INFO Quote of the day: [Your day will be somewhat dictated by authority]
 MyCustomAlg          INFO Retrieved TheSvc = ServiceHandle('ConcreteSvc')
 MyCustomAlg          INFO Empty private tool is empty (OK)
 MyCustomAlg          INFO Empty public tool is empty (OK)
 HistogramPersis...WARNING Histograms saving not required.
-ActiveStoreSvc       INFO Initializing ActiveStoreSvc - package version StoreGate-03-06-31
 ApplicationMgr       INFO Application Manager Initialized successfully
-StoreGateSvc         INFO Start StoreGateSvc
 ApplicationMgr       INFO Application Manager Started successfully
 AthenaEventLoopMgr   INFO   ===>>>  start of run 1    <<<===
 AthenaEventLoopMgr   INFO   ===>>>  start processing event #1, run #1 0 events processed so far  <<<===
@@ -191,21 +201,18 @@ ToolSvc.Tool6        INFO performing templated task factor ( 1) ...
 ToolSvc.Tool6        INFO ... templated task is done
 MyCustomAlg          INFO ... my work is done! 
 AthenaEventLoopMgr   INFO   ===>>>  done processing event #2, run #1 2 events processed so far  <<<===
-StoreGateSvc         INFO Stop StoreGateSvc
-StoreGateSvc         INFO stop: setting service priority to 101 so that event stores get finalized and cleared before other stores
 ApplicationMgr       INFO Application Manager Stopped successfully
 AthAlgSeq            INFO Finalizing AthAlgSeq...
 AthOutSeq            INFO Finalizing AthOutSeq...
 AthRegSeq            INFO Finalizing AthRegSeq...
 AthMasterSeq         INFO Finalizing AthMasterSeq...
-StoreGateSvc         INFO Finalizing StoreGateSvc - package version StoreGate-03-06-31
 ConcreteSvc          INFO Finalizing ConcreteSvc...
 AthDictLoaderSvc     INFO in finalize...
 ToolSvc              INFO Removing all tools created by ToolSvc
 *****Chrono*****     INFO ****************************************************************************************************
 *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
 *****Chrono*****     INFO ****************************************************************************************************
-ChronoStatSvc        INFO Time User   : Tot=  102 [ms]                                             #=  1
+ChronoStatSvc        INFO Time User   : Tot=  330 [ms]                                             #=  1
 *****Chrono*****     INFO ****************************************************************************************************
 ChronoStatSvc.f...   INFO  Service finalized successfully 
 ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/Control/AthenaExamples/AthExJobOptions/src/ConcreteTool.cxx b/Control/AthenaExamples/AthExJobOptions/src/ConcreteTool.cxx
index a3a2c28b8aeddcfb6178eb97087e780756d0afd5..107815fe25dc1d8ad679e64c2ba6a1c3fd1d6951 100755
--- a/Control/AthenaExamples/AthExJobOptions/src/ConcreteTool.cxx
+++ b/Control/AthenaExamples/AthExJobOptions/src/ConcreteTool.cxx
@@ -59,7 +59,7 @@ StatusCode ConcreteTool::performTask( double& result )
 
    msg(MSG::INFO) << "... concrete task is done";
    if ( msgLvl(MSG::DEBUG) ) { msg() << ", result: " << result; }
-   msg(MSG::INFO) << endreq;
+   msg(MSG::INFO) << endmsg;
 
    return StatusCode::SUCCESS;
 }
diff --git a/Control/AthenaExamples/AthExJobOptions/src/TemplatedTool.cxx b/Control/AthenaExamples/AthExJobOptions/src/TemplatedTool.cxx
index 973401deb2a88f9f6e66c650086af18a80e7dda9..7c4db96132094ac2732bf3721282ca20851657da 100755
--- a/Control/AthenaExamples/AthExJobOptions/src/TemplatedTool.cxx
+++ b/Control/AthenaExamples/AthExJobOptions/src/TemplatedTool.cxx
@@ -64,7 +64,7 @@ StatusCode ToolSpace::TemplatedTool< T >::performTask( double& result )
 
    msg(MSG::INFO) << "... templated task is done";
    if ( msgLvl(MSG::DEBUG) ) { msg() << ", result: " << result; }
-   msg(MSG::INFO) << endreq;
+   msg(MSG::INFO) << endmsg;
 
    return StatusCode::SUCCESS;
 }
diff --git a/Control/AthenaExamples/AthExJobOptions/src/ToolUsingTool.cxx b/Control/AthenaExamples/AthExJobOptions/src/ToolUsingTool.cxx
index e442ff45f5c45fee1a70537295ea1daa28391445..b5a295f18f95e734302fec745ffd05ed8d14f874 100755
--- a/Control/AthenaExamples/AthExJobOptions/src/ToolUsingTool.cxx
+++ b/Control/AthenaExamples/AthExJobOptions/src/ToolUsingTool.cxx
@@ -100,7 +100,7 @@ StatusCode ToolUsingTool::performTask( double& result )
 
    msg(MSG::INFO) << "... task using tool is done";
    if ( msgLvl(MSG::DEBUG) ) { msg() << ", result: " << result; }
-   msg(MSG::INFO) << endreq;
+   msg(MSG::INFO) << endmsg;
 
 // make list of tools do their work
    double newvalue = 12345.0;