diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9cc4f95bccbe5f5eed9956e07f5675cc7cea6786..f9497dcf445053ce62026c83857a7af7660d89e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ project(BornAgain)
 # --- General project settings ---
 option(BORNAGAIN_PYTHON "Build with python support" ON)
 option(BORNAGAIN_APP "Build test application" ON)
-option(BORNAGAIN_GUI "Build a graphical user interface" ON)
+option(BORNAGAIN_GUI "Build a graphical user interface" OFF)
 
 #--- Path for additional cmake modules ---
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
diff --git a/Core/PythonAPI/src/Beam.pypp.cpp b/Core/PythonAPI/src/Beam.pypp.cpp
index 99d3cc39bd7029f7f838aa74cae1ca6615e11a63..e2c8d55743ef22fa11641a03dbf69c5dc931fe7f 100644
--- a/Core/PythonAPI/src/Beam.pypp.cpp
+++ b/Core/PythonAPI/src/Beam.pypp.cpp
@@ -99,6 +99,18 @@ struct Beam_wrapper : Beam, bp::wrapper< Beam > {
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -255,6 +267,18 @@ void register_Beam_class(){
                 , default_registerParameter_function_type( &Beam_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( Beam_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            Beam_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&Beam_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/Crystal.pypp.cpp b/Core/PythonAPI/src/Crystal.pypp.cpp
index 17ad3d29da30709d036c66083faf9850d53a1451..980f50fcce0e522a8cea88ee574e6a542ee0d56c 100644
--- a/Core/PythonAPI/src/Crystal.pypp.cpp
+++ b/Core/PythonAPI/src/Crystal.pypp.cpp
@@ -116,6 +116,18 @@ struct Crystal_wrapper : Crystal, bp::wrapper< Crystal > {
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -265,6 +277,18 @@ void register_Crystal_class(){
                 , default_registerParameter_function_type( &Crystal_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( Crystal_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            Crystal_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&Crystal_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/Detector.pypp.cpp b/Core/PythonAPI/src/Detector.pypp.cpp
index 17c52c99368ca4464f26779411000f1a37275fb8..286cff5b79d2a8861c188f1b46e52c2cc7c0c262 100644
--- a/Core/PythonAPI/src/Detector.pypp.cpp
+++ b/Core/PythonAPI/src/Detector.pypp.cpp
@@ -99,6 +99,18 @@ struct Detector_wrapper : Detector, bp::wrapper< Detector > {
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -236,6 +248,18 @@ void register_Detector_class(){
                 , default_registerParameter_function_type( &Detector_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( Detector_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            Detector_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&Detector_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/FTDistribution2DCauchy.pypp.cpp b/Core/PythonAPI/src/FTDistribution2DCauchy.pypp.cpp
index ca3f64b351588b81c7b02a08af7ee0162895b335..7178ab3ede9cd4ccdaece1cfd1994efd3a52d8c1 100644
--- a/Core/PythonAPI/src/FTDistribution2DCauchy.pypp.cpp
+++ b/Core/PythonAPI/src/FTDistribution2DCauchy.pypp.cpp
@@ -135,6 +135,18 @@ struct FTDistribution2DCauchy_wrapper : FTDistribution2DCauchy, bp::wrapper< FTD
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -257,6 +269,18 @@ void register_FTDistribution2DCauchy_class(){
                 , default_registerParameter_function_type( &FTDistribution2DCauchy_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( FTDistribution2DCauchy_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            FTDistribution2DCauchy_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&FTDistribution2DCauchy_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/FormFactorBox.pypp.cpp b/Core/PythonAPI/src/FormFactorBox.pypp.cpp
index a32713bd649a19080e1847792862bb2410f98d4a..6f8c69dc6de763a7f7a65f7432fef69ed37e6496 100644
--- a/Core/PythonAPI/src/FormFactorBox.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorBox.pypp.cpp
@@ -224,6 +224,18 @@ struct FormFactorBox_wrapper : FormFactorBox, bp::wrapper< FormFactorBox > {
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -447,6 +459,18 @@ void register_FormFactorBox_class(){
                 , default_registerParameter_function_type( &FormFactorBox_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( FormFactorBox_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            FormFactorBox_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&FormFactorBox_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/FormFactorCone.pypp.cpp b/Core/PythonAPI/src/FormFactorCone.pypp.cpp
index b4c262a46c4ad0d3c8420fdbcca40155da668ce5..89d0f205559979217b5b29c3eb2b584a78e8673f 100644
--- a/Core/PythonAPI/src/FormFactorCone.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCone.pypp.cpp
@@ -212,6 +212,18 @@ struct FormFactorCone_wrapper : FormFactorCone, bp::wrapper< FormFactorCone > {
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -414,6 +426,18 @@ void register_FormFactorCone_class(){
                 , default_registerParameter_function_type( &FormFactorCone_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( FormFactorCone_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            FormFactorCone_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&FormFactorCone_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp b/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
index d33b80f25ab0294b3ba201b31028f51972235a46..ceabdbe2db012d92b98a5543d24e2da3ee599502 100644
--- a/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCrystal.pypp.cpp
@@ -217,6 +217,18 @@ struct FormFactorCrystal_wrapper : FormFactorCrystal, bp::wrapper< FormFactorCry
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -431,6 +443,18 @@ void register_FormFactorCrystal_class(){
                 , default_registerParameter_function_type( &FormFactorCrystal_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( FormFactorCrystal_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            FormFactorCrystal_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&FormFactorCrystal_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp b/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp
index 240dd84db9f295af1968a470bfa20ad7fd4b0fba..ee19b55f3f5ec2521eb281a363880ec566ce6263 100644
--- a/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorCylinder.pypp.cpp
@@ -248,6 +248,18 @@ struct FormFactorCylinder_wrapper : FormFactorCylinder, bp::wrapper< FormFactorC
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -486,6 +498,18 @@ void register_FormFactorCylinder_class(){
                 , default_registerParameter_function_type( &FormFactorCylinder_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( FormFactorCylinder_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            FormFactorCylinder_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&FormFactorCylinder_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp b/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
index 8a9e360a7a9b9d27e06a1229bd4abddded6e89d2..3e1e77bef05143710c17606739baa8a10f81adfc 100644
--- a/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorDecoratorDebyeWaller.pypp.cpp
@@ -212,6 +212,18 @@ struct FormFactorDecoratorDebyeWaller_wrapper : FormFactorDecoratorDebyeWaller,
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -414,6 +426,18 @@ void register_FormFactorDecoratorDebyeWaller_class(){
                 , default_registerParameter_function_type( &FormFactorDecoratorDebyeWaller_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( FormFactorDecoratorDebyeWaller_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            FormFactorDecoratorDebyeWaller_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&FormFactorDecoratorDebyeWaller_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/FormFactorEllipsoid.pypp.cpp b/Core/PythonAPI/src/FormFactorEllipsoid.pypp.cpp
index 70b768937454b922129637c26b36d41498af6b05..2445e215a90c56ed3aad46a50a69d1582da105cc 100644
--- a/Core/PythonAPI/src/FormFactorEllipsoid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorEllipsoid.pypp.cpp
@@ -224,6 +224,18 @@ struct FormFactorEllipsoid_wrapper : FormFactorEllipsoid, bp::wrapper< FormFacto
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -447,6 +459,18 @@ void register_FormFactorEllipsoid_class(){
                 , default_registerParameter_function_type( &FormFactorEllipsoid_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( FormFactorEllipsoid_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            FormFactorEllipsoid_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&FormFactorEllipsoid_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp b/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp
index af6e979baeca09ab9484885ec9a11f2945517bdd..bb3d482d9ce52c6842b46124e5f58bd7c90f7532 100644
--- a/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorFullSphere.pypp.cpp
@@ -236,6 +236,18 @@ struct FormFactorFullSphere_wrapper : FormFactorFullSphere, bp::wrapper< FormFac
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -462,6 +474,18 @@ void register_FormFactorFullSphere_class(){
                 , default_registerParameter_function_type( &FormFactorFullSphere_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( FormFactorFullSphere_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            FormFactorFullSphere_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&FormFactorFullSphere_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp b/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp
index 42b5a282887e9f568065043ba45e345e07dc2883..18a4a31895f0f37b2d93dc51ad4bbe04ce199666 100644
--- a/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorFullSpheroid.pypp.cpp
@@ -212,6 +212,18 @@ struct FormFactorFullSpheroid_wrapper : FormFactorFullSpheroid, bp::wrapper< For
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -414,6 +426,18 @@ void register_FormFactorFullSpheroid_class(){
                 , default_registerParameter_function_type( &FormFactorFullSpheroid_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( FormFactorFullSpheroid_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            FormFactorFullSpheroid_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&FormFactorFullSpheroid_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/FormFactorGauss.pypp.cpp b/Core/PythonAPI/src/FormFactorGauss.pypp.cpp
index a15262b4836ad9293beeb7bdcc43afa14ee9e73a..c8cf6fa74432131a40ed7a8c35a641e629791e8c 100644
--- a/Core/PythonAPI/src/FormFactorGauss.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorGauss.pypp.cpp
@@ -231,6 +231,18 @@ struct FormFactorGauss_wrapper : FormFactorGauss, bp::wrapper< FormFactorGauss >
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -446,6 +458,18 @@ void register_FormFactorGauss_class(){
                 , default_registerParameter_function_type( &FormFactorGauss_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( FormFactorGauss_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            FormFactorGauss_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&FormFactorGauss_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/FormFactorHemiSpheroid.pypp.cpp b/Core/PythonAPI/src/FormFactorHemiSpheroid.pypp.cpp
index 43f766aaa928abe374f3a053c63ba15120438aec..8a8e806768be0bd81677fa7762fbbd1338cd486c 100644
--- a/Core/PythonAPI/src/FormFactorHemiSpheroid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorHemiSpheroid.pypp.cpp
@@ -212,6 +212,18 @@ struct FormFactorHemiSpheroid_wrapper : FormFactorHemiSpheroid, bp::wrapper< For
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -414,6 +426,18 @@ void register_FormFactorHemiSpheroid_class(){
                 , default_registerParameter_function_type( &FormFactorHemiSpheroid_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( FormFactorHemiSpheroid_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            FormFactorHemiSpheroid_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&FormFactorHemiSpheroid_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp b/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp
index 90327dd6a6eccb6260a178ad927db10ef279e42c..500f7ff1defc701a86a7a29f03a2d033333006f7 100644
--- a/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorLorentz.pypp.cpp
@@ -231,6 +231,18 @@ struct FormFactorLorentz_wrapper : FormFactorLorentz, bp::wrapper< FormFactorLor
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -446,6 +458,18 @@ void register_FormFactorLorentz_class(){
                 , default_registerParameter_function_type( &FormFactorLorentz_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( FormFactorLorentz_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            FormFactorLorentz_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&FormFactorLorentz_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/FormFactorParallelepiped.pypp.cpp b/Core/PythonAPI/src/FormFactorParallelepiped.pypp.cpp
index 9cc5960eefe4265774ced8f226b2106ee48cdbd1..9e678b35a8bbcbf24b452fef5c609f0249315af1 100644
--- a/Core/PythonAPI/src/FormFactorParallelepiped.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorParallelepiped.pypp.cpp
@@ -224,6 +224,18 @@ struct FormFactorParallelepiped_wrapper : FormFactorParallelepiped, bp::wrapper<
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -438,6 +450,18 @@ void register_FormFactorParallelepiped_class(){
                 , default_registerParameter_function_type( &FormFactorParallelepiped_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( FormFactorParallelepiped_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            FormFactorParallelepiped_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&FormFactorParallelepiped_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp b/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp
index 91ebcc9ecfeaa572dfe13b35b36c269ed5d7fc6a..55f9c6566bdac70c8a327cbfa16de41d2712770b 100644
--- a/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorPrism3.pypp.cpp
@@ -260,6 +260,18 @@ struct FormFactorPrism3_wrapper : FormFactorPrism3, bp::wrapper< FormFactorPrism
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -509,6 +521,18 @@ void register_FormFactorPrism3_class(){
                 , default_registerParameter_function_type( &FormFactorPrism3_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( FormFactorPrism3_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            FormFactorPrism3_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&FormFactorPrism3_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp b/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp
index 8442d80023dfe1ac2717eca014040650feab4f21..d1aa6cc01425342b51aaf5ca58e6f5c8d95dd46f 100644
--- a/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorPrism6.pypp.cpp
@@ -224,6 +224,18 @@ struct FormFactorPrism6_wrapper : FormFactorPrism6, bp::wrapper< FormFactorPrism
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -438,6 +450,18 @@ void register_FormFactorPrism6_class(){
                 , default_registerParameter_function_type( &FormFactorPrism6_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( FormFactorPrism6_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            FormFactorPrism6_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&FormFactorPrism6_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp b/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp
index 2146af388f536ca40155a4a51495b58395fcf02e..b133da68bf220460a52057d02f06c2f60f9a61f8 100644
--- a/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorPyramid.pypp.cpp
@@ -284,6 +284,18 @@ struct FormFactorPyramid_wrapper : FormFactorPyramid, bp::wrapper< FormFactorPyr
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -556,6 +568,18 @@ void register_FormFactorPyramid_class(){
                 , default_registerParameter_function_type( &FormFactorPyramid_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( FormFactorPyramid_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            FormFactorPyramid_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&FormFactorPyramid_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/FormFactorSphere.pypp.cpp b/Core/PythonAPI/src/FormFactorSphere.pypp.cpp
index 3bdf99073efb0633293b9c3ec029402bf17ba136..a20a1890e5f33d9fb8bc10cfb94809451226811d 100644
--- a/Core/PythonAPI/src/FormFactorSphere.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorSphere.pypp.cpp
@@ -212,6 +212,18 @@ struct FormFactorSphere_wrapper : FormFactorSphere, bp::wrapper< FormFactorSpher
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -414,6 +426,18 @@ void register_FormFactorSphere_class(){
                 , default_registerParameter_function_type( &FormFactorSphere_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( FormFactorSphere_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            FormFactorSphere_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&FormFactorSphere_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp b/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp
index 557fc18c9a93d9b71d3d120a8acf9a83dbb3872a..5aadd71976382e2c90e57f937aae93f78a23a10b 100644
--- a/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp
+++ b/Core/PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp
@@ -224,6 +224,18 @@ struct FormFactorSphereGaussianRadius_wrapper : FormFactorSphereGaussianRadius,
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -438,6 +450,18 @@ void register_FormFactorSphereGaussianRadius_class(){
                 , default_registerParameter_function_type( &FormFactorSphereGaussianRadius_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( FormFactorSphereGaussianRadius_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            FormFactorSphereGaussianRadius_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&FormFactorSphereGaussianRadius_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/IClusteredParticles.pypp.cpp b/Core/PythonAPI/src/IClusteredParticles.pypp.cpp
index 8888b5eb8b0c7dec5849872d15d0c342ee128bda..b2dc3bec03dcd0a5bdf35f6353f828fd2516f0ce 100644
--- a/Core/PythonAPI/src/IClusteredParticles.pypp.cpp
+++ b/Core/PythonAPI/src/IClusteredParticles.pypp.cpp
@@ -121,6 +121,18 @@ struct IClusteredParticles_wrapper : IClusteredParticles, bp::wrapper< IClustere
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -241,6 +253,18 @@ void register_IClusteredParticles_class(){
                 , default_registerParameter_function_type( &IClusteredParticles_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( IClusteredParticles_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            IClusteredParticles_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&IClusteredParticles_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/ICompositeSample.pypp.cpp b/Core/PythonAPI/src/ICompositeSample.pypp.cpp
index 352fb40c1be22805519af9c21ebb5c189475d155..ca169d66b1195d92c825cb813aee67c8e6887365 100644
--- a/Core/PythonAPI/src/ICompositeSample.pypp.cpp
+++ b/Core/PythonAPI/src/ICompositeSample.pypp.cpp
@@ -109,6 +109,18 @@ struct ICompositeSample_wrapper : ICompositeSample, bp::wrapper< ICompositeSampl
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -217,6 +229,18 @@ void register_ICompositeSample_class(){
                 , default_registerParameter_function_type( &ICompositeSample_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( ICompositeSample_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            ICompositeSample_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&ICompositeSample_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/IDecoration.pypp.cpp b/Core/PythonAPI/src/IDecoration.pypp.cpp
index eb647e1e0a77a56333d530b099f6ec180982b257..3e897b053a99140447a8a753a571a7fc6ccfc63b 100644
--- a/Core/PythonAPI/src/IDecoration.pypp.cpp
+++ b/Core/PythonAPI/src/IDecoration.pypp.cpp
@@ -139,6 +139,18 @@ struct IDecoration_wrapper : IDecoration, bp::wrapper< IDecoration > {
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -324,6 +336,18 @@ void register_IDecoration_class(){
                 , default_registerParameter_function_type( &IDecoration_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( IDecoration_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            IDecoration_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&IDecoration_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/IDetectorResolution.pypp.cpp b/Core/PythonAPI/src/IDetectorResolution.pypp.cpp
index 791afdbbb89bfe0a8db2c8ee2baf902d6c5c7e91..2ac71b82b8d091acd0a28ae5f861d1682740b439 100644
--- a/Core/PythonAPI/src/IDetectorResolution.pypp.cpp
+++ b/Core/PythonAPI/src/IDetectorResolution.pypp.cpp
@@ -102,6 +102,18 @@ struct IDetectorResolution_wrapper : IDetectorResolution, bp::wrapper< IDetector
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -208,6 +220,18 @@ void register_IDetectorResolution_class(){
                 , default_registerParameter_function_type( &IDetectorResolution_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( IDetectorResolution_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            IDetectorResolution_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&IDetectorResolution_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/IFTDistribution2D.pypp.cpp b/Core/PythonAPI/src/IFTDistribution2D.pypp.cpp
index 3e0819da07dff38e9cb126774ff42b0c637c1898..bcd19d0838aa60d7bdbfab1b286f13ae6782e73b 100644
--- a/Core/PythonAPI/src/IFTDistribution2D.pypp.cpp
+++ b/Core/PythonAPI/src/IFTDistribution2D.pypp.cpp
@@ -107,6 +107,18 @@ struct IFTDistribution2D_wrapper : IFTDistribution2D, bp::wrapper< IFTDistributi
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -251,6 +263,18 @@ void register_IFTDistribution2D_class(){
                 , default_registerParameter_function_type( &IFTDistribution2D_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( IFTDistribution2D_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            IFTDistribution2D_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&IFTDistribution2D_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/IFormFactor.pypp.cpp b/Core/PythonAPI/src/IFormFactor.pypp.cpp
index a4604b0dc84fc6f9f5013596ac2a6147833f4721..481829c60076d0f934c198f3929373a35d7c29a4 100644
--- a/Core/PythonAPI/src/IFormFactor.pypp.cpp
+++ b/Core/PythonAPI/src/IFormFactor.pypp.cpp
@@ -198,6 +198,18 @@ struct IFormFactor_wrapper : IFormFactor, bp::wrapper< IFormFactor > {
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -396,6 +408,18 @@ void register_IFormFactor_class(){
                 , default_registerParameter_function_type( &IFormFactor_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( IFormFactor_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            IFormFactor_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&IFormFactor_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp b/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
index 58832bef87c1124615c7a957d0a25580128a72c5..dbcc13be33ed05c960279905ee3e35ab8588653e 100644
--- a/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
+++ b/Core/PythonAPI/src/IFormFactorBorn.pypp.cpp
@@ -210,6 +210,18 @@ struct IFormFactorBorn_wrapper : IFormFactorBorn, bp::wrapper< IFormFactorBorn >
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -420,6 +432,18 @@ void register_IFormFactorBorn_class(){
                 , default_registerParameter_function_type( &IFormFactorBorn_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( IFormFactorBorn_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            IFormFactorBorn_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&IFormFactorBorn_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp b/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
index 4e17d6fbeb12be48be1e549969a4873e0c3d2063..13c4b0d107326be28cc7bb0548547d21135518e8 100644
--- a/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
+++ b/Core/PythonAPI/src/IFormFactorDecorator.pypp.cpp
@@ -191,6 +191,18 @@ struct IFormFactorDecorator_wrapper : IFormFactorDecorator, bp::wrapper< IFormFa
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -389,6 +401,18 @@ void register_IFormFactorDecorator_class(){
                 , default_registerParameter_function_type( &IFormFactorDecorator_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( IFormFactorDecorator_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            IFormFactorDecorator_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&IFormFactorDecorator_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp b/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp
index 9cf760032b669f3cd6b8c23c0284452d334a4379..225595bd6f178b50146594467b23aa51c67146f7 100644
--- a/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp
+++ b/Core/PythonAPI/src/IInterferenceFunction.pypp.cpp
@@ -138,6 +138,18 @@ struct IInterferenceFunction_wrapper : IInterferenceFunction, bp::wrapper< IInte
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -279,6 +291,18 @@ void register_IInterferenceFunction_class(){
                 , default_registerParameter_function_type( &IInterferenceFunction_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( IInterferenceFunction_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            IInterferenceFunction_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&IInterferenceFunction_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/IParameterized.pypp.cpp b/Core/PythonAPI/src/IParameterized.pypp.cpp
index 5c6ebffeeede8ce3c0ae7380a7806a6c458d4b5b..a877d62ddc8a79a787310eb88b336f103cd0fc39 100644
--- a/Core/PythonAPI/src/IParameterized.pypp.cpp
+++ b/Core/PythonAPI/src/IParameterized.pypp.cpp
@@ -106,6 +106,18 @@ struct IParameterized_wrapper : IParameterized, bp::wrapper< IParameterized > {
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -215,6 +227,18 @@ void register_IParameterized_class(){
                 , default_registerParameter_function_type( &IParameterized_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( IParameterized_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            IParameterized_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&IParameterized_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/IResolutionFunction2D.pypp.cpp b/Core/PythonAPI/src/IResolutionFunction2D.pypp.cpp
index 41b775dc6300d331c48bd8883a0c05ff65e7c393..6fb03f15fa94c212e0cb39ff67a23b9a1f2df6d3 100644
--- a/Core/PythonAPI/src/IResolutionFunction2D.pypp.cpp
+++ b/Core/PythonAPI/src/IResolutionFunction2D.pypp.cpp
@@ -102,6 +102,18 @@ struct IResolutionFunction2D_wrapper : IResolutionFunction2D, bp::wrapper< IReso
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -208,6 +220,18 @@ void register_IResolutionFunction2D_class(){
                 , default_registerParameter_function_type( &IResolutionFunction2D_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( IResolutionFunction2D_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            IResolutionFunction2D_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&IResolutionFunction2D_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/ISample.pypp.cpp b/Core/PythonAPI/src/ISample.pypp.cpp
index a8ed7288c4a2e42e7d0e59813bb7c22b9bdf6beb..1cd53ce97544679d75259f15518c4075388d34c1 100644
--- a/Core/PythonAPI/src/ISample.pypp.cpp
+++ b/Core/PythonAPI/src/ISample.pypp.cpp
@@ -133,6 +133,18 @@ struct ISample_wrapper : ISample, bp::wrapper< ISample > {
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -283,6 +295,18 @@ void register_ISample_class(){
                 , default_registerParameter_function_type( &ISample_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( ISample_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            ISample_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&ISample_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/ISampleBuilder.pypp.cpp b/Core/PythonAPI/src/ISampleBuilder.pypp.cpp
index 48973a8d6aef66c0db0cb3851104b14058e89232..324cda2a65e75b670f60703f702560a5b3588d02 100644
--- a/Core/PythonAPI/src/ISampleBuilder.pypp.cpp
+++ b/Core/PythonAPI/src/ISampleBuilder.pypp.cpp
@@ -111,6 +111,18 @@ struct ISampleBuilder_wrapper : ISampleBuilder, bp::wrapper< ISampleBuilder > {
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -209,6 +221,18 @@ void register_ISampleBuilder_class(){
                 , default_registerParameter_function_type( &ISampleBuilder_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( ISampleBuilder_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            ISampleBuilder_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&ISampleBuilder_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/Instrument.pypp.cpp b/Core/PythonAPI/src/Instrument.pypp.cpp
index 7e2dc045bda7dd8d658fda3e4ef1e616b4c16a2c..f39802358545385a9cf76252d24b10400a573c0d 100644
--- a/Core/PythonAPI/src/Instrument.pypp.cpp
+++ b/Core/PythonAPI/src/Instrument.pypp.cpp
@@ -99,6 +99,18 @@ struct Instrument_wrapper : Instrument, bp::wrapper< Instrument > {
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -303,6 +315,18 @@ void register_Instrument_class(){
                 , default_registerParameter_function_type( &Instrument_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( Instrument_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            Instrument_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&Instrument_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp b/Core/PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp
index f5d3ee564de993775ea1b4559080245a5153b785..faa78986054190d4e74dd4a32ca7bcfac3c24672 100644
--- a/Core/PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp
@@ -152,6 +152,18 @@ struct InterferenceFunction1DParaCrystal_wrapper : InterferenceFunction1DParaCry
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -317,6 +329,18 @@ void register_InterferenceFunction1DParaCrystal_class(){
                 , default_registerParameter_function_type( &InterferenceFunction1DParaCrystal_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( InterferenceFunction1DParaCrystal_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            InterferenceFunction1DParaCrystal_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&InterferenceFunction1DParaCrystal_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp b/Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp
index bb05e39b1b5e9a39ee9c2789f583e8cac2ba3b21..16dc31d06030467973f68fb04dd6962d231c5efc 100644
--- a/Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp
@@ -152,6 +152,18 @@ struct InterferenceFunction2DLattice_wrapper : InterferenceFunction2DLattice, bp
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -307,6 +319,18 @@ void register_InterferenceFunction2DLattice_class(){
                 , default_registerParameter_function_type( &InterferenceFunction2DLattice_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( InterferenceFunction2DLattice_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            InterferenceFunction2DLattice_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&InterferenceFunction2DLattice_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp b/Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp
index 156d1e720c67ec42680b615dc2c1f974db67e987..0d7dc9a550c6d24b9b3f8353bd7ecace3d6555b5 100644
--- a/Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp
@@ -152,6 +152,18 @@ struct InterferenceFunction2DParaCrystal_wrapper : InterferenceFunction2DParaCry
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -349,6 +361,18 @@ void register_InterferenceFunction2DParaCrystal_class(){
                 , default_registerParameter_function_type( &InterferenceFunction2DParaCrystal_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( InterferenceFunction2DParaCrystal_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            InterferenceFunction2DParaCrystal_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&InterferenceFunction2DParaCrystal_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp b/Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp
index 9e36ca1e3c466782c69952a9921e35c80f53d5d8..3215e69713ef111b9fb747e50e46e3cf132327f3 100644
--- a/Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp
+++ b/Core/PythonAPI/src/InterferenceFunctionNone.pypp.cpp
@@ -152,6 +152,18 @@ struct InterferenceFunctionNone_wrapper : InterferenceFunctionNone, bp::wrapper<
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -297,6 +309,18 @@ void register_InterferenceFunctionNone_class(){
                 , default_registerParameter_function_type( &InterferenceFunctionNone_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( InterferenceFunctionNone_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            InterferenceFunctionNone_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&InterferenceFunctionNone_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/LatticeBasis.pypp.cpp b/Core/PythonAPI/src/LatticeBasis.pypp.cpp
index e144b5a5d9585778499684d7fdcdd8e8357a7094..d2e62372b8ef7d64715c9e8a6c14723c90adf3c7 100644
--- a/Core/PythonAPI/src/LatticeBasis.pypp.cpp
+++ b/Core/PythonAPI/src/LatticeBasis.pypp.cpp
@@ -140,6 +140,18 @@ struct LatticeBasis_wrapper : LatticeBasis, bp::wrapper< LatticeBasis > {
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -294,6 +306,18 @@ void register_LatticeBasis_class(){
                 , default_registerParameter_function_type( &LatticeBasis_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( LatticeBasis_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            LatticeBasis_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&LatticeBasis_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/Layer.pypp.cpp b/Core/PythonAPI/src/Layer.pypp.cpp
index 3c6ce6f8a7a7dfc9346ff7a1da07aa7a1da19079..b33f0a0225ea932c16fdcfc4330ba463b2d0dbca 100644
--- a/Core/PythonAPI/src/Layer.pypp.cpp
+++ b/Core/PythonAPI/src/Layer.pypp.cpp
@@ -245,6 +245,18 @@ struct Layer_wrapper : Layer, bp::wrapper< Layer > {
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -463,6 +475,18 @@ void register_Layer_class(){
                 , default_registerParameter_function_type( &Layer_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( Layer_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            Layer_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&Layer_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/LayerInterface.pypp.cpp b/Core/PythonAPI/src/LayerInterface.pypp.cpp
index 09e91c515a373b2ac2bc47b2df427fe1f8e8878e..b600ce47ceb31ee75ee4827eabf24f825a178b70 100644
--- a/Core/PythonAPI/src/LayerInterface.pypp.cpp
+++ b/Core/PythonAPI/src/LayerInterface.pypp.cpp
@@ -97,6 +97,18 @@ struct LayerInterface_wrapper : LayerInterface, bp::wrapper< LayerInterface > {
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -235,6 +247,18 @@ void register_LayerInterface_class(){
                 , default_registerParameter_function_type( &LayerInterface_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( LayerInterface_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            LayerInterface_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&LayerInterface_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/LayerRoughness.pypp.cpp b/Core/PythonAPI/src/LayerRoughness.pypp.cpp
index 1cbdaaaca9fb28a14cd98948494bfdb126107f98..f8a0c6491c4edc04af782e1d89625d9292ec1e9f 100644
--- a/Core/PythonAPI/src/LayerRoughness.pypp.cpp
+++ b/Core/PythonAPI/src/LayerRoughness.pypp.cpp
@@ -135,6 +135,18 @@ struct LayerRoughness_wrapper : LayerRoughness, bp::wrapper< LayerRoughness > {
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -335,6 +347,18 @@ void register_LayerRoughness_class(){
                 , default_registerParameter_function_type( &LayerRoughness_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( LayerRoughness_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            LayerRoughness_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&LayerRoughness_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/MesoCrystal.pypp.cpp b/Core/PythonAPI/src/MesoCrystal.pypp.cpp
index ec1cffea82e478bab2972376976646ea0d3aa9de..6a2f367506a5b59d151f5dc5dd0cae5f8bc6d405 100644
--- a/Core/PythonAPI/src/MesoCrystal.pypp.cpp
+++ b/Core/PythonAPI/src/MesoCrystal.pypp.cpp
@@ -128,6 +128,18 @@ struct MesoCrystal_wrapper : MesoCrystal, bp::wrapper< MesoCrystal > {
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -260,6 +272,18 @@ void register_MesoCrystal_class(){
                 , default_registerParameter_function_type( &MesoCrystal_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( MesoCrystal_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            MesoCrystal_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&MesoCrystal_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/MultiLayer.pypp.cpp b/Core/PythonAPI/src/MultiLayer.pypp.cpp
index ed9e2da5b154d2dc7fe76fd385d7c04fb4c9b183..dde8ee8de51a1495cb63445e94e6eaa7b250f3d6 100644
--- a/Core/PythonAPI/src/MultiLayer.pypp.cpp
+++ b/Core/PythonAPI/src/MultiLayer.pypp.cpp
@@ -116,6 +116,18 @@ struct MultiLayer_wrapper : MultiLayer, bp::wrapper< MultiLayer > {
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -376,6 +388,18 @@ void register_MultiLayer_class(){
                 , default_registerParameter_function_type( &MultiLayer_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( MultiLayer_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            MultiLayer_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&MultiLayer_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/Particle.pypp.cpp b/Core/PythonAPI/src/Particle.pypp.cpp
index 2cc0985e8eeb96a3cc82b0bd4a9251de5329cef5..14998ed4fb092e26f6a31474b676b26af22591b5 100644
--- a/Core/PythonAPI/src/Particle.pypp.cpp
+++ b/Core/PythonAPI/src/Particle.pypp.cpp
@@ -202,6 +202,18 @@ struct Particle_wrapper : Particle, bp::wrapper< Particle > {
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -394,6 +406,18 @@ void register_Particle_class(){
                 , default_registerParameter_function_type( &Particle_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( Particle_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            Particle_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&Particle_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/ParticleCoreShell.pypp.cpp b/Core/PythonAPI/src/ParticleCoreShell.pypp.cpp
index 6482b19436a385a509667c7b827a68271d65fb57..9bf73f518ba0795cfe418b221f2439645360a147 100644
--- a/Core/PythonAPI/src/ParticleCoreShell.pypp.cpp
+++ b/Core/PythonAPI/src/ParticleCoreShell.pypp.cpp
@@ -128,6 +128,18 @@ struct ParticleCoreShell_wrapper : ParticleCoreShell, bp::wrapper< ParticleCoreS
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -260,6 +272,18 @@ void register_ParticleCoreShell_class(){
                 , default_registerParameter_function_type( &ParticleCoreShell_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( ParticleCoreShell_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            ParticleCoreShell_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&ParticleCoreShell_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/ParticleDecoration.pypp.cpp b/Core/PythonAPI/src/ParticleDecoration.pypp.cpp
index 78b6fdc9858326c7f7a2d671adb07fe11543779e..43ff146e9391d6b4a2505c282a072300d84681d1 100644
--- a/Core/PythonAPI/src/ParticleDecoration.pypp.cpp
+++ b/Core/PythonAPI/src/ParticleDecoration.pypp.cpp
@@ -176,6 +176,18 @@ struct ParticleDecoration_wrapper : ParticleDecoration, bp::wrapper< ParticleDec
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -395,6 +407,18 @@ void register_ParticleDecoration_class(){
                 , default_registerParameter_function_type( &ParticleDecoration_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( ParticleDecoration_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            ParticleDecoration_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&ParticleDecoration_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/ParticleInfo.pypp.cpp b/Core/PythonAPI/src/ParticleInfo.pypp.cpp
index 39d6486289534ef1286a49f5f621ba9149810e0a..a5cb7be1f6c20e8a0ee154e3bb4bd1ab20df79bd 100644
--- a/Core/PythonAPI/src/ParticleInfo.pypp.cpp
+++ b/Core/PythonAPI/src/ParticleInfo.pypp.cpp
@@ -116,6 +116,18 @@ struct ParticleInfo_wrapper : ParticleInfo, bp::wrapper< ParticleInfo > {
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -274,6 +286,18 @@ void register_ParticleInfo_class(){
                 , default_registerParameter_function_type( &ParticleInfo_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( ParticleInfo_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            ParticleInfo_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&ParticleInfo_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/PositionParticleInfo.pypp.cpp b/Core/PythonAPI/src/PositionParticleInfo.pypp.cpp
index dfbc61d5090767f4e0b2d4e4b83ba8f9e508b70d..3e94fdb5370189ec341d03d99d23d3237efacf2c 100644
--- a/Core/PythonAPI/src/PositionParticleInfo.pypp.cpp
+++ b/Core/PythonAPI/src/PositionParticleInfo.pypp.cpp
@@ -116,6 +116,18 @@ struct PositionParticleInfo_wrapper : PositionParticleInfo, bp::wrapper< Positio
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -255,6 +267,18 @@ void register_PositionParticleInfo_class(){
                 , default_registerParameter_function_type( &PositionParticleInfo_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( PositionParticleInfo_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            PositionParticleInfo_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&PositionParticleInfo_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/PythonModule.cpp b/Core/PythonAPI/src/PythonModule.cpp
index eae618f07d371d766940a53f489048d706196b93..8b364db0c182221d42206b0978fd09509caeb764 100644
--- a/Core/PythonAPI/src/PythonModule.cpp
+++ b/Core/PythonAPI/src/PythonModule.cpp
@@ -7,8 +7,8 @@
 #include "Bin1D.pypp.h" 
 #include "Bin1DCVector.pypp.h" 
 #include "Crystal.pypp.h" 
+#include "cvector_t.pypp.h" 
 #include "Detector.pypp.h" 
-#include "FTDistribution2DCauchy.pypp.h" 
 #include "FormFactorBox.pypp.h" 
 #include "FormFactorCone.pypp.h" 
 #include "FormFactorCrystal.pypp.h" 
@@ -26,6 +26,7 @@
 #include "FormFactorPyramid.pypp.h" 
 #include "FormFactorSphere.pypp.h" 
 #include "FormFactorSphereGaussianRadius.pypp.h" 
+#include "FTDistribution2DCauchy.pypp.h" 
 #include "HomogeneousMaterial.pypp.h" 
 #include "IAxis.pypp.h" 
 #include "ICloneable.pypp.h" 
@@ -33,23 +34,24 @@
 #include "ICompositeSample.pypp.h" 
 #include "IDecoration.pypp.h" 
 #include "IDetectorResolution.pypp.h" 
-#include "IFTDistribution2D.pypp.h" 
 #include "IFormFactor.pypp.h" 
 #include "IFormFactorBorn.pypp.h" 
 #include "IFormFactorDecorator.pypp.h" 
+#include "IFTDistribution2D.pypp.h" 
 #include "IInterferenceFunction.pypp.h" 
 #include "IMaterial.pypp.h" 
+#include "Instrument.pypp.h" 
+#include "InterferenceFunction1DParaCrystal.pypp.h" 
+#include "InterferenceFunction2DLattice.pypp.h" 
+#include "InterferenceFunction2DParaCrystal.pypp.h" 
+#include "InterferenceFunctionNone.pypp.h" 
 #include "IParameterized.pypp.h" 
 #include "IResolutionFunction2D.pypp.h" 
 #include "ISample.pypp.h" 
 #include "ISampleBuilder.pypp.h" 
 #include "ISelectionRule.pypp.h" 
 #include "ITransform3D.pypp.h" 
-#include "Instrument.pypp.h" 
-#include "InterferenceFunction1DParaCrystal.pypp.h" 
-#include "InterferenceFunction2DLattice.pypp.h" 
-#include "InterferenceFunction2DParaCrystal.pypp.h" 
-#include "InterferenceFunctionNone.pypp.h" 
+#include "kvector_t.pypp.h" 
 #include "Lattice.pypp.h" 
 #include "Lattice2DIFParameters.pypp.h" 
 #include "LatticeBasis.pypp.h" 
@@ -59,6 +61,7 @@
 #include "MaterialManager.pypp.h" 
 #include "MesoCrystal.pypp.h" 
 #include "MultiLayer.pypp.h" 
+#include "ndimdata_t.pypp.h" 
 #include "OutputDataIOFactory.pypp.h" 
 #include "ParameterPool.pypp.h" 
 #include "Particle.pypp.h" 
@@ -80,9 +83,6 @@
 #include "StochasticDoubleGaussian.pypp.h" 
 #include "StochasticParameter_t.pypp.h" 
 #include "StochasticSampledParameter.pypp.h" 
-#include "cvector_t.pypp.h" 
-#include "kvector_t.pypp.h" 
-#include "ndimdata_t.pypp.h" 
 #include "vdouble1d_t.pypp.h" 
 #include "vector_IFormFactorPtr_t.pypp.h" 
 #include "vector_integer_t.pypp.h" 
diff --git a/Core/PythonAPI/src/ResolutionFunction2DSimple.pypp.cpp b/Core/PythonAPI/src/ResolutionFunction2DSimple.pypp.cpp
index c607587eab0ffd99e151b0118fc973e1cf0132c8..2b60275edbe18de579def50a3085769c8da7b354 100644
--- a/Core/PythonAPI/src/ResolutionFunction2DSimple.pypp.cpp
+++ b/Core/PythonAPI/src/ResolutionFunction2DSimple.pypp.cpp
@@ -116,6 +116,18 @@ struct ResolutionFunction2DSimple_wrapper : ResolutionFunction2DSimple, bp::wrap
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -226,6 +238,18 @@ void register_ResolutionFunction2DSimple_class(){
                 , default_registerParameter_function_type( &ResolutionFunction2DSimple_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( ResolutionFunction2DSimple_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            ResolutionFunction2DSimple_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&ResolutionFunction2DSimple_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/PythonAPI/src/Simulation.pypp.cpp b/Core/PythonAPI/src/Simulation.pypp.cpp
index 75059f6d4bf617ff13d0a42ab9aad9cbeb0844b8..b91ac645550325d0b5d82071368635e8f45692f8 100644
--- a/Core/PythonAPI/src/Simulation.pypp.cpp
+++ b/Core/PythonAPI/src/Simulation.pypp.cpp
@@ -104,6 +104,18 @@ struct Simulation_wrapper : Simulation, bp::wrapper< Simulation > {
         }
     }
 
+    virtual int setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        if( bp::override func_setMatchedParametersValue = this->get_override( "setMatchedParametersValue" ) )
+            return func_setMatchedParametersValue( wildcards, value );
+        else{
+            return this->IParameterized::setMatchedParametersValue( wildcards, value );
+        }
+    }
+    
+    int default_setMatchedParametersValue( ::std::string const & wildcards, double value ) {
+        return IParameterized::setMatchedParametersValue( wildcards, value );
+    }
+
     virtual bool setParameterValue( ::std::string const & name, double value ) {
         if( bp::override func_setParameterValue = this->get_override( "setParameterValue" ) )
             return func_setParameterValue( name, value );
@@ -407,6 +419,18 @@ void register_Simulation_class(){
                 , default_registerParameter_function_type( &Simulation_wrapper::default_registerParameter )
                 , ( bp::arg("inst"), bp::arg("name"), bp::arg("parpointer") ) );
         
+        }
+        { //::IParameterized::setMatchedParametersValue
+        
+            typedef int ( ::IParameterized::*setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            typedef int ( Simulation_wrapper::*default_setMatchedParametersValue_function_type )( ::std::string const &,double ) ;
+            
+            Simulation_exposer.def( 
+                "setMatchedParametersValue"
+                , setMatchedParametersValue_function_type(&::IParameterized::setMatchedParametersValue)
+                , default_setMatchedParametersValue_function_type(&Simulation_wrapper::default_setMatchedParametersValue)
+                , ( bp::arg("wildcards"), bp::arg("value") ) );
+        
         }
         { //::IParameterized::setParameterValue
         
diff --git a/Core/Tools/inc/IParameterized.h b/Core/Tools/inc/IParameterized.h
index 66404d115f6e7fcfe81c12eacc159a69b590ee3b..3b28cc2b637183d4c429a851f20ed37d8cbe1685 100644
--- a/Core/Tools/inc/IParameterized.h
+++ b/Core/Tools/inc/IParameterized.h
@@ -61,6 +61,12 @@ public:
     virtual bool setParameterValue(const std::string &name, double value)
     { return m_parameters.setParameterValue(name, value); }
 
+    //! Sets parameter value, return number of changed parameters
+    virtual int setMatchedParametersValue(const std::string& wildcards, double value)
+    {
+        return m_parameters.setMatchedParametersValue(wildcards, value);
+    }
+
     //! clear parameter pool
     virtual void clearParameterPool() { m_parameters.clear(); }
 
diff --git a/Core/python_module.pri b/Core/python_module.pri
index ffb6a52a612fa73ded6cfce83ce2cbd5bfe2045b..b46099939988d568e799b033e646cdca2632f9af 100644
--- a/Core/python_module.pri
+++ b/Core/python_module.pri
@@ -8,8 +8,8 @@ HEADERS +=  \
     PythonAPI/inc/Bin1D.pypp.h \
     PythonAPI/inc/Bin1DCVector.pypp.h \
     PythonAPI/inc/Crystal.pypp.h \
+    PythonAPI/inc/cvector_t.pypp.h \
     PythonAPI/inc/Detector.pypp.h \
-    PythonAPI/inc/FTDistribution2DCauchy.pypp.h \
     PythonAPI/inc/FormFactorBox.pypp.h \
     PythonAPI/inc/FormFactorCone.pypp.h \
     PythonAPI/inc/FormFactorCrystal.pypp.h \
@@ -27,6 +27,7 @@ HEADERS +=  \
     PythonAPI/inc/FormFactorPyramid.pypp.h \
     PythonAPI/inc/FormFactorSphere.pypp.h \
     PythonAPI/inc/FormFactorSphereGaussianRadius.pypp.h \
+    PythonAPI/inc/FTDistribution2DCauchy.pypp.h \
     PythonAPI/inc/HomogeneousMaterial.pypp.h \
     PythonAPI/inc/IAxis.pypp.h \
     PythonAPI/inc/ICloneable.pypp.h \
@@ -34,23 +35,24 @@ HEADERS +=  \
     PythonAPI/inc/ICompositeSample.pypp.h \
     PythonAPI/inc/IDecoration.pypp.h \
     PythonAPI/inc/IDetectorResolution.pypp.h \
-    PythonAPI/inc/IFTDistribution2D.pypp.h \
     PythonAPI/inc/IFormFactor.pypp.h \
     PythonAPI/inc/IFormFactorBorn.pypp.h \
     PythonAPI/inc/IFormFactorDecorator.pypp.h \
+    PythonAPI/inc/IFTDistribution2D.pypp.h \
     PythonAPI/inc/IInterferenceFunction.pypp.h \
     PythonAPI/inc/IMaterial.pypp.h \
+    PythonAPI/inc/Instrument.pypp.h \
+    PythonAPI/inc/InterferenceFunction1DParaCrystal.pypp.h \
+    PythonAPI/inc/InterferenceFunction2DLattice.pypp.h \
+    PythonAPI/inc/InterferenceFunction2DParaCrystal.pypp.h \
+    PythonAPI/inc/InterferenceFunctionNone.pypp.h \
     PythonAPI/inc/IParameterized.pypp.h \
     PythonAPI/inc/IResolutionFunction2D.pypp.h \
     PythonAPI/inc/ISample.pypp.h \
     PythonAPI/inc/ISampleBuilder.pypp.h \
     PythonAPI/inc/ISelectionRule.pypp.h \
     PythonAPI/inc/ITransform3D.pypp.h \
-    PythonAPI/inc/Instrument.pypp.h \
-    PythonAPI/inc/InterferenceFunction1DParaCrystal.pypp.h \
-    PythonAPI/inc/InterferenceFunction2DLattice.pypp.h \
-    PythonAPI/inc/InterferenceFunction2DParaCrystal.pypp.h \
-    PythonAPI/inc/InterferenceFunctionNone.pypp.h \
+    PythonAPI/inc/kvector_t.pypp.h \
     PythonAPI/inc/Lattice.pypp.h \
     PythonAPI/inc/Lattice2DIFParameters.pypp.h \
     PythonAPI/inc/LatticeBasis.pypp.h \
@@ -60,6 +62,7 @@ HEADERS +=  \
     PythonAPI/inc/MaterialManager.pypp.h \
     PythonAPI/inc/MesoCrystal.pypp.h \
     PythonAPI/inc/MultiLayer.pypp.h \
+    PythonAPI/inc/ndimdata_t.pypp.h \
     PythonAPI/inc/OutputDataIOFactory.pypp.h \
     PythonAPI/inc/ParameterPool.pypp.h \
     PythonAPI/inc/Particle.pypp.h \
@@ -81,9 +84,6 @@ HEADERS +=  \
     PythonAPI/inc/StochasticDoubleGaussian.pypp.h \
     PythonAPI/inc/StochasticParameter_t.pypp.h \
     PythonAPI/inc/StochasticSampledParameter.pypp.h \
-    PythonAPI/inc/cvector_t.pypp.h \
-    PythonAPI/inc/kvector_t.pypp.h \
-    PythonAPI/inc/ndimdata_t.pypp.h \
     PythonAPI/inc/vdouble1d_t.pypp.h \
     PythonAPI/inc/vector_IFormFactorPtr_t.pypp.h \
     PythonAPI/inc/vector_integer_t.pypp.h \
@@ -100,8 +100,8 @@ SOURCES +=  \
     PythonAPI/src/Bin1D.pypp.cpp \
     PythonAPI/src/Bin1DCVector.pypp.cpp \
     PythonAPI/src/Crystal.pypp.cpp \
+    PythonAPI/src/cvector_t.pypp.cpp \
     PythonAPI/src/Detector.pypp.cpp \
-    PythonAPI/src/FTDistribution2DCauchy.pypp.cpp \
     PythonAPI/src/FormFactorBox.pypp.cpp \
     PythonAPI/src/FormFactorCone.pypp.cpp \
     PythonAPI/src/FormFactorCrystal.pypp.cpp \
@@ -119,6 +119,7 @@ SOURCES +=  \
     PythonAPI/src/FormFactorPyramid.pypp.cpp \
     PythonAPI/src/FormFactorSphere.pypp.cpp \
     PythonAPI/src/FormFactorSphereGaussianRadius.pypp.cpp \
+    PythonAPI/src/FTDistribution2DCauchy.pypp.cpp \
     PythonAPI/src/HomogeneousMaterial.pypp.cpp \
     PythonAPI/src/IAxis.pypp.cpp \
     PythonAPI/src/ICloneable.pypp.cpp \
@@ -126,23 +127,24 @@ SOURCES +=  \
     PythonAPI/src/ICompositeSample.pypp.cpp \
     PythonAPI/src/IDecoration.pypp.cpp \
     PythonAPI/src/IDetectorResolution.pypp.cpp \
-    PythonAPI/src/IFTDistribution2D.pypp.cpp \
     PythonAPI/src/IFormFactor.pypp.cpp \
     PythonAPI/src/IFormFactorBorn.pypp.cpp \
     PythonAPI/src/IFormFactorDecorator.pypp.cpp \
+    PythonAPI/src/IFTDistribution2D.pypp.cpp \
     PythonAPI/src/IInterferenceFunction.pypp.cpp \
     PythonAPI/src/IMaterial.pypp.cpp \
+    PythonAPI/src/Instrument.pypp.cpp \
+    PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp \
+    PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp \
+    PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp \
+    PythonAPI/src/InterferenceFunctionNone.pypp.cpp \
     PythonAPI/src/IParameterized.pypp.cpp \
     PythonAPI/src/IResolutionFunction2D.pypp.cpp \
     PythonAPI/src/ISample.pypp.cpp \
     PythonAPI/src/ISampleBuilder.pypp.cpp \
     PythonAPI/src/ISelectionRule.pypp.cpp \
     PythonAPI/src/ITransform3D.pypp.cpp \
-    PythonAPI/src/Instrument.pypp.cpp \
-    PythonAPI/src/InterferenceFunction1DParaCrystal.pypp.cpp \
-    PythonAPI/src/InterferenceFunction2DLattice.pypp.cpp \
-    PythonAPI/src/InterferenceFunction2DParaCrystal.pypp.cpp \
-    PythonAPI/src/InterferenceFunctionNone.pypp.cpp \
+    PythonAPI/src/kvector_t.pypp.cpp \
     PythonAPI/src/Lattice.pypp.cpp \
     PythonAPI/src/Lattice2DIFParameters.pypp.cpp \
     PythonAPI/src/LatticeBasis.pypp.cpp \
@@ -152,6 +154,7 @@ SOURCES +=  \
     PythonAPI/src/MaterialManager.pypp.cpp \
     PythonAPI/src/MesoCrystal.pypp.cpp \
     PythonAPI/src/MultiLayer.pypp.cpp \
+    PythonAPI/src/ndimdata_t.pypp.cpp \
     PythonAPI/src/OutputDataIOFactory.pypp.cpp \
     PythonAPI/src/ParameterPool.pypp.cpp \
     PythonAPI/src/Particle.pypp.cpp \
@@ -173,9 +176,6 @@ SOURCES +=  \
     PythonAPI/src/StochasticDoubleGaussian.pypp.cpp \
     PythonAPI/src/StochasticParameter_t.pypp.cpp \
     PythonAPI/src/StochasticSampledParameter.pypp.cpp \
-    PythonAPI/src/cvector_t.pypp.cpp \
-    PythonAPI/src/kvector_t.pypp.cpp \
-    PythonAPI/src/ndimdata_t.pypp.cpp \
     PythonAPI/src/vdouble1d_t.pypp.cpp \
     PythonAPI/src/vector_IFormFactorPtr_t.pypp.cpp \
     PythonAPI/src/vector_integer_t.pypp.cpp \
diff --git a/Doc/UserManual/UserManual.pdf b/Doc/UserManual/UserManual.pdf
index db1e10586fe54b1adab3e442b53895e59fdaf310..01d344b44e670ad1e6dfeca8dadac47bbce4cd45 100644
Binary files a/Doc/UserManual/UserManual.pdf and b/Doc/UserManual/UserManual.pdf differ
diff --git a/Doc/UserManual/UserManual.tex b/Doc/UserManual/UserManual.tex
index d6dc3b3b6114601231843bb5943d58013835e8c2..ad167de155451a3679b41f6c8b6c23112b662916 100644
--- a/Doc/UserManual/UserManual.tex
+++ b/Doc/UserManual/UserManual.tex
@@ -183,7 +183,7 @@ Forschungszentrum J\"ulich GmbH
 \input{QuickStart}
 \input{Installation}
 \input{SimulationExamples}
-%\input{FittingExamples}
+\input{FittingExamples}
 \input{SoftwareArchitecture}
 %\input{SoftwareDesignOverview}
 %\appendix
diff --git a/Examples/python/README b/Examples/python/README
index 3569f4365203af148debd7655498f0d0073ccfdc..298793d8ca5baf811120f18947d5da70a00e5ec3 100644
--- a/Examples/python/README
+++ b/Examples/python/README
@@ -1,16 +1,15 @@
 BornAgain usage examples.
 
+This directory contains three sets of examples aimed to demonstrate 
+to the user how to simulate and fit with BornAgain.
+
 Content:
+./simulation - simulation examples
+./fitting    - fitting examples
+./demos      - collection of scripts used in different demonstrations
 
-ex001_CylindersAndPrisms             - Mixture of cylinders and prisms without interference (IsGISAXS example #1)
-ex002_CylindersWithSizeDistribution  - Mixture cylinder particles with different size distribution (IsGISAXS example #2)
-ex003_CylinderFormfactor             - Cylinder formfactor in BA and DWBA (IsGISAXS example #3)
-ex004_CylindersParaCrystal           - 1D and 2D paracrystal (IsGISAXS example #4)
-ex006_LatticeWithDisorder            - 2D lattice with different disorder (IsGISAXS example #6)
-ex009_RotatedPyramids                - Pyramids, rotated pyramids on top of substrate (IsGISAXS example #9)
 
 
-More examples in ./Tests/FunctionalTests
 
 
 
diff --git a/Examples/python/fitting/README b/Examples/python/fitting/README
new file mode 100644
index 0000000000000000000000000000000000000000..e2e9469fc185908f20b258b65e0545dfde4f7ed2
--- /dev/null
+++ b/Examples/python/fitting/README
@@ -0,0 +1,15 @@
+BornAgain fitting examples.
+
+In this directory one can find examples of complete applications
+used for fitting.
+
+--- ex001_SampleParametersIntro ---
+    This example shows how to create a sample with fixed parameters and then
+    change this parameters on the fly during runtime.
+    The example doesn't contain any fitting and serve as a gentle introduction
+    to other fitting examples.
+
+--- ex002_FitCylindersAndPrisms ---
+    The model "mixture of cylinders and prisms without interference"
+    will be used to fit real data.
+
diff --git a/Examples/python/fitting/ex001_SampleParametersIntro/SampleParametersIntro.py b/Examples/python/fitting/ex001_SampleParametersIntro/SampleParametersIntro.py
new file mode 100644
index 0000000000000000000000000000000000000000..4bf11c0052918cff31ed2834fc8678f67f908aad
--- /dev/null
+++ b/Examples/python/fitting/ex001_SampleParametersIntro/SampleParametersIntro.py
@@ -0,0 +1,96 @@
+# This example shows how to create a sample with fixed parameters and then
+# change this parameters on the fly during runtime.
+# The example doesn't contain any fitting and serve as a gentle introduction
+# to other fitting examples.
+
+import sys, os, numpy, pylab, matplotlib
+from libBornAgainCore import *
+
+
+def get_sample():
+    """
+    Build and return the sample representing cylinders and pyramids on top of
+    substrate without interference. Sample is made for fixed set of parameters.
+    """
+    # defining materials
+    m_air = MaterialManager.getHomogeneousMaterial("Air", 0.0, 0.0 )
+    m_substrate = MaterialManager.getHomogeneousMaterial("Substrate", 6e-6, 2e-8 )
+    m_particle = MaterialManager.getHomogeneousMaterial("Particle", 6e-4, 2e-8 )
+
+    # collection of particles
+    cylinder_ff = FormFactorCylinder(5*nanometer, 5*nanometer)
+    cylinder = Particle(m_particle, cylinder_ff)
+    prism_ff = FormFactorPrism3(5*nanometer, 5*nanometer)
+    prism = Particle(m_particle, prism_ff)
+    particle_decoration = ParticleDecoration()
+    particle_decoration.addParticle(cylinder, 0.0, 0.5)
+    particle_decoration.addParticle(prism, 0.0, 0.5)
+    interference = InterferenceFunctionNone()
+    particle_decoration.addInterferenceFunction(interference)
+
+    # air layer with particles and substrate form multi layer
+    air_layer = Layer(m_air)
+    air_layer.setDecoration(particle_decoration)
+    substrate_layer = Layer(m_substrate, 0)
+    multi_layer = MultiLayer()
+    multi_layer.addLayer(air_layer)
+    multi_layer.addLayer(substrate_layer)
+    return multi_layer
+
+
+def get_simulation():
+    """
+    Create and return GISAXS simulation with beam and detector defined
+    """
+    simulation = Simulation()
+    simulation.setDetectorParameters(100, -1.0*degree, 1.0*degree
+        , 100, 0.0*degree, 2.0*degree, True)
+    simulation.setBeamParameters(1.0*angstrom, 0.2*degree, 0.0*degree)
+    return simulation
+
+
+def run_simulations():
+    """
+    Runs simulations for the sample with different sample parameters.
+    """
+
+    sample = get_sample()
+    print "The sample contains following parameters ('name':value)"
+    sample.printParameters()
+
+    simulation = get_simulation()
+    simulation.setSample(sample)
+
+    results = []
+
+    # simulation #1
+    # # initial sample is used
+    simulation.runSimulation()
+    results.append( GetOutputData(simulation) )
+
+    # simulation #2
+    # one sample parameter (height of the cylinder) is changed using exact parameter name
+    sample.setParameterValue('/MultiLayer/Layer0/ParticleDecoration/ParticleInfo0/Particle/FormFactorCylinder/height'
+        , 1.0*nanometer)
+    simulation.runSimulation()
+    results.append( GetOutputData(simulation) )
+
+    # simulation #3
+    # all parameters which are matching criteria will be changed
+    
+
+    return results
+
+
+#-------------------------------------------------------------
+# main()
+#-------------------------------------------------------------
+if __name__ == '__main__':
+    results = run_simulations()
+#    result = run_simulation() + 1 # for log scale
+#    pylab.imshow(numpy.rot90(result, 1), 
+#                 norm=matplotlib.colors.LogNorm(), 
+#                 extent=[-1.0, 1.0, 0, 2.0])
+#    pylab.show()    
+
+
diff --git a/Examples/python/ex021_FitCylindersAndPrisms/FitCylindersPrisms.py b/Examples/python/fitting/ex002_FitCylindersAndPrisms/FitCylindersPrisms.py
similarity index 100%
rename from Examples/python/ex021_FitCylindersAndPrisms/FitCylindersPrisms.py
rename to Examples/python/fitting/ex002_FitCylindersAndPrisms/FitCylindersPrisms.py
diff --git a/Examples/python/ex021_FitCylindersAndPrisms/Refdata_fitcylinderprisms.txt b/Examples/python/fitting/ex002_FitCylindersAndPrisms/Refdata_fitcylinderprisms.txt
similarity index 100%
rename from Examples/python/ex021_FitCylindersAndPrisms/Refdata_fitcylinderprisms.txt
rename to Examples/python/fitting/ex002_FitCylindersAndPrisms/Refdata_fitcylinderprisms.txt
diff --git a/Examples/python/simulation/README b/Examples/python/simulation/README
new file mode 100644
index 0000000000000000000000000000000000000000..70bc37a8b43ad7f935f8947d376b259b79bd8b3e
--- /dev/null
+++ b/Examples/python/simulation/README
@@ -0,0 +1,29 @@
+BornAgain simulation examples.
+
+In this directory one can find examples of complete applications
+used for different simulation studies.
+
+--- ex001_CylindersAndPrisms ---
+    Mixture of cylinders and prisms without interference.
+    Corresponds to IsGISAXS example #1.
+
+--- ex002_CylindersWithSizeDistribution --- 
+    Mixture cylinder particles with different size distribution.
+    Corresponds to IsGISAXS example #2.
+
+--- ex003_CylinderFormfactor --- 
+    Cylinder formfactor in BA and DWBA.
+    Corresponds to IsGISAXS example #3.
+
+--- ex004_CylindersParaCrystal --- 
+    1D and 2D paracrystal. 
+    Corresponds to IsGISAXS example #4.
+
+--- ex005_LatticeWithDisorder ---
+    2D lattice with different disorder.
+    Corresponds to IsGISAXS example #6.
+
+--- ex006_RotatedPyramids ---
+    Pyramids, rotated pyramids on top of substrate.
+    Corresponds to IsGISAXS example #9.
+
diff --git a/Examples/python/ex001_CylindersAndPrisms/CylindersAndPrisms.py b/Examples/python/simulation/ex001_CylindersAndPrisms/CylindersAndPrisms.py
similarity index 100%
rename from Examples/python/ex001_CylindersAndPrisms/CylindersAndPrisms.py
rename to Examples/python/simulation/ex001_CylindersAndPrisms/CylindersAndPrisms.py
diff --git a/Examples/python/ex002_CylindersWithSizeDistribution/CylindersWithSizeDistribution.py b/Examples/python/simulation/ex002_CylindersWithSizeDistribution/CylindersWithSizeDistribution.py
similarity index 100%
rename from Examples/python/ex002_CylindersWithSizeDistribution/CylindersWithSizeDistribution.py
rename to Examples/python/simulation/ex002_CylindersWithSizeDistribution/CylindersWithSizeDistribution.py
diff --git a/Examples/python/ex003_CylinderFormfactor/CylinderFormfactorInBA.py b/Examples/python/simulation/ex003_CylinderFormfactor/CylinderFormfactorInBA.py
similarity index 100%
rename from Examples/python/ex003_CylinderFormfactor/CylinderFormfactorInBA.py
rename to Examples/python/simulation/ex003_CylinderFormfactor/CylinderFormfactorInBA.py
diff --git a/Examples/python/ex003_CylinderFormfactor/CylinderFormfactorInBASize.py b/Examples/python/simulation/ex003_CylinderFormfactor/CylinderFormfactorInBASize.py
similarity index 100%
rename from Examples/python/ex003_CylinderFormfactor/CylinderFormfactorInBASize.py
rename to Examples/python/simulation/ex003_CylinderFormfactor/CylinderFormfactorInBASize.py
diff --git a/Examples/python/ex003_CylinderFormfactor/CylinderFormfactorInDWBA.py b/Examples/python/simulation/ex003_CylinderFormfactor/CylinderFormfactorInDWBA.py
similarity index 100%
rename from Examples/python/ex003_CylinderFormfactor/CylinderFormfactorInDWBA.py
rename to Examples/python/simulation/ex003_CylinderFormfactor/CylinderFormfactorInDWBA.py
diff --git a/Examples/python/ex004_CylindersParaCrystal/CylindersParaCrystal_1DDL.py b/Examples/python/simulation/ex004_CylindersParaCrystal/CylindersParaCrystal_1DDL.py
similarity index 100%
rename from Examples/python/ex004_CylindersParaCrystal/CylindersParaCrystal_1DDL.py
rename to Examples/python/simulation/ex004_CylindersParaCrystal/CylindersParaCrystal_1DDL.py
diff --git a/Examples/python/ex004_CylindersParaCrystal/CylindersParaCrystal_2DDL.py b/Examples/python/simulation/ex004_CylindersParaCrystal/CylindersParaCrystal_2DDL.py
similarity index 100%
rename from Examples/python/ex004_CylindersParaCrystal/CylindersParaCrystal_2DDL.py
rename to Examples/python/simulation/ex004_CylindersParaCrystal/CylindersParaCrystal_2DDL.py
diff --git a/Examples/python/ex006_LatticeWithDisorder/LatticeWithDisorder1.py b/Examples/python/simulation/ex005_LatticeWithDisorder/LatticeWithDisorder1.py
similarity index 100%
rename from Examples/python/ex006_LatticeWithDisorder/LatticeWithDisorder1.py
rename to Examples/python/simulation/ex005_LatticeWithDisorder/LatticeWithDisorder1.py
diff --git a/Examples/python/ex006_LatticeWithDisorder/LatticeWithDisorder2.py b/Examples/python/simulation/ex005_LatticeWithDisorder/LatticeWithDisorder2.py
similarity index 100%
rename from Examples/python/ex006_LatticeWithDisorder/LatticeWithDisorder2.py
rename to Examples/python/simulation/ex005_LatticeWithDisorder/LatticeWithDisorder2.py
diff --git a/Examples/python/ex006_LatticeWithDisorder/LatticeWithDisorder3.py b/Examples/python/simulation/ex005_LatticeWithDisorder/LatticeWithDisorder3.py
similarity index 100%
rename from Examples/python/ex006_LatticeWithDisorder/LatticeWithDisorder3.py
rename to Examples/python/simulation/ex005_LatticeWithDisorder/LatticeWithDisorder3.py
diff --git a/Examples/python/ex006_LatticeWithDisorder/LatticeWithDisorder4.py b/Examples/python/simulation/ex005_LatticeWithDisorder/LatticeWithDisorder4.py
similarity index 100%
rename from Examples/python/ex006_LatticeWithDisorder/LatticeWithDisorder4.py
rename to Examples/python/simulation/ex005_LatticeWithDisorder/LatticeWithDisorder4.py
diff --git a/Examples/python/ex009_RotatedPyramids/Pyramids.py b/Examples/python/simulation/ex006_RotatedPyramids/Pyramids.py
similarity index 100%
rename from Examples/python/ex009_RotatedPyramids/Pyramids.py
rename to Examples/python/simulation/ex006_RotatedPyramids/Pyramids.py
diff --git a/Examples/python/ex009_RotatedPyramids/RotatedPyramids.py b/Examples/python/simulation/ex006_RotatedPyramids/RotatedPyramids.py
similarity index 100%
rename from Examples/python/ex009_RotatedPyramids/RotatedPyramids.py
rename to Examples/python/simulation/ex006_RotatedPyramids/RotatedPyramids.py
diff --git a/Tests/FunctionalTests/TestCore/README b/Tests/FunctionalTests/TestCore/README
index 420684d5f89051aeb46b6fd5ca9b26d2f08653da..32be47bdb7555550d1f277cb7e00479bf803fa6a 100644
--- a/Tests/FunctionalTests/TestCore/README
+++ b/Tests/FunctionalTests/TestCore/README
@@ -3,13 +3,12 @@ Collection of functional tests (C++)
 Collection contains functional tests for BornAgainCore library.
 Each test defines simple geometry, runs simulation and then compare results of the simulation with reference data.
 
-To build all tests
-qmake; make
+Tests are compiled and executed automatically when user builds the whole project with 'check' target
+cmake; make check
 
-To run tests
-python TestCore.py
+--- List of tests ---
 
-Tests taken from IsGISAXS:
+Tests reproducing IsGISAXS functionality:
 IsGISAXS01   - Mixture of cylinders and prisms without interference (IsGISAXS example #1)
 IsGISAXS02   - Mixture cylinder particles with different size distribution (IsGISAXS example #2)
 IsGISAXS03   - Cylinder formfactor in BA and DWBA (IsGISAXS example #3)
@@ -22,7 +21,6 @@ IsGISAXS10   - Cylinders with interference on top of substrate (IsGISAXS example
 IsGISAXS11   - Core shell nanoparticles (IsGISAXS example #11)
 IsGISAXS15   - Size spacing correlation approximation (IsGISAXS example #15)
 
-
 Other tests:
 MesoCrystal1 - Meso crystal simulation
 
diff --git a/Tests/FunctionalTests/TestPyCore/README b/Tests/FunctionalTests/TestPyCore/README
index ef59d5e0a8a2430d293e51cb6d01b746b428586e..acbb83aa903cb5ad5995a9ec70294fc7ba69e240 100644
--- a/Tests/FunctionalTests/TestPyCore/README
+++ b/Tests/FunctionalTests/TestPyCore/README
@@ -3,13 +3,12 @@ Collection of functional tests (Python)
 Collection contains functional tests for BornAgainCore library.
 Each test defines simple geometry, runs simulation and then compare results of the simulation with reference data.
 
-To build all tests
-qmake; make
+Tests are executed automatically when user builds the whole project with 'check' target:
+cmake; make check
 
-To run tests
-python TestPyCore.py
+--- List of tests ---
 
-List of tests
+Tests reproducing IsGISAXS functionality:
 IsGISAXS01   - Mixture of cylinders and prisms without interference (IsGISAXS example #1)
 IsGISAXS02   - Mixture cylinder particles with different size distribution (IsGISAXS example #2)
 IsGISAXS03   - Cylinder formfactor in BA and DWBA (IsGISAXS example #3)
@@ -21,4 +20,6 @@ IsGISAXS09   - Pyramids on top of substrate - Rotated pyramids on top of substra
 IsGISAXS10   - Cylinders with interference on top of substrate (IsGISAXS example #10)
 IsGISAXS11   - Core shell nanoparticles (IsGISAXS example #11)
 IsGISAXS15   - Size spacing correlation approximation (IsGISAXS example #15)
+
+Other tests:
 MesoCrystal1 - Meso crystal simulation