diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDD/cmt/requirements b/MuonSpectrometer/MuonDetDescr/MuonAGDD/cmt/requirements
index 09372baca2fef34b7900309b36b25b9a0de1c18f..13b99abd25c73f4230b56673dbd68004e46fdeb1 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDD/cmt/requirements
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDD/cmt/requirements
@@ -9,21 +9,18 @@ use GaudiInterface      GaudiInterface-*        External
 
 library MuonAGDD *.cxx components/*.cxx
 apply_pattern component_library
-
-apply_pattern install_runtime
+apply_pattern declare_python_modules files="*.py"
 
 public
-use AGDDKernel		    	AGDDKernel-*		 	DetectorDescription/AGDD
 use AGDDControl		    	AGDDControl-*			DetectorDescription/AGDD
 
 private
+use AGDDKernel		    	AGDDKernel-*		 	DetectorDescription/AGDD
 use MuonAGDDBase			MuonAGDDBase-*			MuonSpectrometer/MuonDetDescr
 use StoreGate               StoreGate-*             Control
 use GeoModelInterfaces      GeoModelInterfaces-*    DetectorDescription/GeoModel
-use MuonGeoModel            MuonGeoModel-*          MuonSpectrometer
 use AGDDModel				AGDDModel-*				DetectorDescription/AGDD
 use AGDD2GeoSvc		    	AGDD2GeoSvc-*			DetectorDescription/AGDD
-use GeoModelKernel      	GeoModelKernel-*        DetectorDescription/GeoModel
 use MuonReadoutGeometry     MuonReadoutGeometry-*   MuonSpectrometer/MuonDetDescr
 use EventInfo               EventInfo-*             Event
 use EventInfoMgt            EventInfoMgt-*          Event
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDD/python/MuonAGDDConfig.py b/MuonSpectrometer/MuonDetDescr/MuonAGDD/python/MuonAGDDConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..3cf1a622047764312601fb4b7d019c3cfc1866a6
--- /dev/null
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDD/python/MuonAGDDConfig.py
@@ -0,0 +1,15 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon import CfgMgr
+
+def MuonAGDDTool(name="MuonSpectrometer", **kwargs):
+    kwargs.setdefault("BuildNSW", False)
+    return CfgMgr.MuonAGDDTool(name, **kwargs)
+
+def NSWAGDDTool(name="NewSmallWheel", **kwargs):
+    kwargs.setdefault("Locked", False)
+    kwargs.setdefault("XMLFiles", ["NSW_StationDescription.xml"])
+    kwargs.setdefault("Volumes", ["NewSmallWheel"])
+    kwargs.setdefault("DefaultDetector", "Muon")
+    return CfgMgr.NSWAGDDTool(name, **kwargs)
+
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDD/python/MuonAGDDConfigDb.py b/MuonSpectrometer/MuonDetDescr/MuonAGDD/python/MuonAGDDConfigDb.py
new file mode 100644
index 0000000000000000000000000000000000000000..2a8104c4c66bcc49dacd2d5245b8931d11b702b2
--- /dev/null
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDD/python/MuonAGDDConfigDb.py
@@ -0,0 +1,6 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+from AthenaCommon.CfgGetter import addTool
+
+addTool("MuonAGDD.MuonAGDDConfig.MuonAGDDTool", "MuonSpectrometer")
+addTool("MuonAGDD.MuonAGDDConfig.NSWAGDDTool", "NewSmallWheel")
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDTool.cxx b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDTool.cxx
index 8b5fbfb3440896c900b6604276920ff70d0db34c..ce58f48f983fb696feebefbdbc3fbabff92dee31 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDTool.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/MuonAGDDTool.cxx
@@ -18,7 +18,6 @@ MuonAGDDTool::MuonAGDDTool(const std::string& type, const std::string& name,
 {
   	declareProperty( "Structures" ,     m_structuresToBuild);
   	declareProperty( "ReadAGDD",   		m_readAGDD);
-  	declareProperty( "Locked",			m_locked);
   	declareProperty( "DumpAGDD",		m_dumpAGDD);
   	declareProperty( "OverrideConfiguration",m_overrideConfiguration=false);
 	declareProperty( "BuildNSW",		m_buildNSW);
diff --git a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/NSWAGDDTool.cxx b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/NSWAGDDTool.cxx
index e08358a3d01aef4172445e172950894b60dc8471..c4052d37ae8954ec31d89fe6ddcd784d94b828d4 100644
--- a/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/NSWAGDDTool.cxx
+++ b/MuonSpectrometer/MuonDetDescr/MuonAGDD/src/NSWAGDDTool.cxx
@@ -20,7 +20,7 @@ using namespace MuonGM;
 NSWAGDDTool::NSWAGDDTool(const std::string& type, const std::string& name, 
 				 const IInterface* parent):AGDDToolBase(type,name,parent)
 {
-	std::cout<<"This is NSWAGDDTool's constructor!!!! "<<name<<std::endl;
+  //std::cout<<"This is NSWAGDDTool's constructor!!!! "<<name<<std::endl;
 }
 
 StatusCode NSWAGDDTool::initialize()