diff --git a/EGnEgtUUID.h b/EGnEgtUUID.h
index 6244890..42dbf3a 100644
--- a/EGnEgtUUID.h
+++ b/EGnEgtUUID.h
@@ -1,19 +1,20 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2015-2015
+//  EgalTech 2015-2019
 //----------------------------------------------------------------------------
-// File : EGnEgtUUID.h       Data : 01.06.15        Versione : 1.6f1
+// File : EGnEgtUUID.h       Data : 16.05.19        Versione : 2.1e3
 // Contenuto : Dichiarazione struttura EgtUUID e sue funzioni.
 //
 //
 //
 // Modifiche : 01.06.15 DS Creazione modulo.
-//
+//             16.05.19 DS Aggiunta funzione IsUUID.
 //
 //----------------------------------------------------------------------------
 
 #pragma once
 
 #include <string>
+#include <vector>
 
 //----------------------- Macro per import/export ----------------------------
 #undef EGN_EXPORT
@@ -44,6 +45,8 @@ struct EgtUUID {
 EGN_EXPORT bool CreateEgtUUID( EgtUUID& uuId) ;
 EGN_EXPORT std::string ToString( const EgtUUID& uuId) ;
 EGN_EXPORT bool FromString( const std::string& sVal, EgtUUID& uuId) ;
+inline bool IsUUID( const std::string& sVal)
+               { EgtUUID Tmp ; return FromString( sVal, Tmp) ; }
 
 //----------------------------------------------------------------------------
 namespace std {
@@ -57,3 +60,6 @@ namespace std {
        }
    };
 }
+
+//----------------------------------------------------------------------------
+typedef std::vector<EgtUUID> UUIDVECTOR ;
diff --git a/EInAPI.h b/EInAPI.h
index 631179e..23384e1 100644
--- a/EInAPI.h
+++ b/EInAPI.h
@@ -564,7 +564,7 @@ EIN_EXPORT BOOL __stdcall EgtVerifyMachining( int nMchId, int* pnResult) ;
 EIN_EXPORT int  __stdcall EgtVerifyCutAsSplitting( int nMchId) ;
 
 // Machining
-EIN_EXPORT BOOL __stdcall EgtInitMachMgr( const wchar_t* wsMachinesDir) ;
+EIN_EXPORT BOOL __stdcall EgtInitMachMgr( const wchar_t* wsMachinesDir, const wchar_t* wsToolMakersDir) ;
 // Errors
 EIN_EXPORT int __stdcall EgtGetLastMachMgrErrorId( void) ;
 EIN_EXPORT wchar_t* __stdcall EgtGetLastMachMgrErrorString( void) ;
@@ -660,6 +660,7 @@ EIN_EXPORT BOOL __stdcall EgtTdbGetCurrToolParamInt( int nType, int* pnVal) ;
 EIN_EXPORT BOOL __stdcall EgtTdbGetCurrToolParamDouble( int nType, double* pdVal) ;
 EIN_EXPORT BOOL __stdcall EgtTdbGetCurrToolParamString( int nType, wchar_t*& wsVal) ;
 EIN_EXPORT BOOL __stdcall EgtTdbGetCurrToolMaxDepth( double* pdVal) ;
+EIN_EXPORT int  __stdcall EgtTdbCurrToolDraw( int nGenCtx, int nToolCtx) ;
 EIN_EXPORT BOOL __stdcall EgtTdbReload( void) ;
 EIN_EXPORT BOOL __stdcall EgtTdbSave( void) ;
 EIN_EXPORT BOOL __stdcall EgtTdbGetToolDir( wchar_t*& wsToolDir) ;
diff --git a/EMkMachMgr.h b/EMkMachMgr.h
index 6a9c675..683be5f 100644
--- a/EMkMachMgr.h
+++ b/EMkMachMgr.h
@@ -1,13 +1,13 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2015-2018
+//  EgalTech 2015-2019
 //----------------------------------------------------------------------------
-// File : EMkMachMgr.h           Data : 27.11.18          Versione : 1.9k2
+// File : EMkMachMgr.h           Data : 16.05.19          Versione : 2.1e3
 // Contenuto : Dichiarazione della interfaccia IMachMgr.
 //
 //
 //
 // Modifiche : 23.03.15 DS Creazione modulo.
-//
+//             16.05.19 DS Aggiunto parametro sToolMakersDir a Init.
 //
 //----------------------------------------------------------------------------
 
@@ -30,7 +30,7 @@ class __declspec( novtable) IMachMgr
    public :
      // Basic
       virtual ~IMachMgr( void) {} 
-      virtual bool Init( const std::string& sMachinesDir, IGeomDB* pGeomDB,
+      virtual bool Init( const std::string& sMachinesDir, const std::string& sToolMakersDir, IGeomDB* pGeomDB,
                          int nContextId, const std::string& sLuaLibsDir, const std::string& sLuaLastRequire) = 0 ;
       virtual bool Update( void) = 0 ;
       virtual bool Insert( int nInsGrp) = 0 ;
@@ -129,6 +129,7 @@ class __declspec( novtable) IMachMgr
       virtual bool TdbGetCurrToolParam( int nType, double& dVal) const = 0 ;
       virtual bool TdbGetCurrToolParam( int nType, std::string& sVal) const = 0 ;
       virtual bool TdbGetCurrToolMaxDepth( double& dMaxDepth) const = 0 ;
+      virtual int  TdbCurrToolDraw( int nGenCtx, int nToolCtx) const = 0 ;
       virtual bool TdbReload( void) = 0 ;
       virtual bool TdbSave( void) const = 0 ;
       virtual bool TdbGetToolDir( std::string& sToolDir) const = 0 ;
diff --git a/EMkToolConst.h b/EMkToolConst.h
index b2e185e..9032369 100644
--- a/EMkToolConst.h
+++ b/EMkToolConst.h
@@ -24,6 +24,8 @@ const int TF_MILL =     0x0400 ;   // 1024
 const int TF_MORTISE =  0x0800 ;   // 2048
 const int TF_CHISEL =   0x1000 ;   // 4096
 const int TF_COMPO =    0x2000 ;   // 8192
+// Costante per tutte le famiglie
+const int TF_ALL = 0xFF00 ;
 // Tipologie di utensili
 enum ToolType {
    TT_NONE = 0,
@@ -86,6 +88,10 @@ enum TpaType { TPA_NONE =                        0,
                TPA_TCPOS =         ( TPA_STR +  5),
                TPA_UUID =          ( TPA_STR +  6)} ;
 
+//----------------------------------------------------------------------------
+// Costante per errore interno nel disegno degli utensili
+const int TD_INT_ERR = 999 ;
+
 //----------------------------------------------------------------------------
 // Costanti per info in note di sistema
 const std::string TSI_THLEN = "THH" ;                   // lunghezza portautensile da naso mandrino
diff --git a/EXeExecutor.h b/EXeExecutor.h
index 0cece96..81cfeb9 100644
--- a/EXeExecutor.h
+++ b/EXeExecutor.h
@@ -239,7 +239,7 @@ EXE_EXPORT int  ExeCreatePolygonFromSide( int nParentId, int nNumSides, const Po
 EXE_EXPORT int  ExeCreateCirclesAlongCurve( int nParentId, int nCrvId, double dOffset, double dOverlap,
                                             double dStartAdd, double dEndAdd, double dDiam, int* pnCount) ;
 // GeomDB Create Surf
-EXE_EXPORT int  ExeCreateSurfFlatRegion( int nParentId, INTVECTOR& vCrvIds, int* pnCount) ;
+EXE_EXPORT int  ExeCreateSurfFlatRegion( int nParentId, const INTVECTOR& vCrvIds, int* pnCount) ;
 EXE_EXPORT int  ExeCreateSurfFrFatCurve( int nParentId, int nCrvId, double dRad, bool bSquared) ;
 EXE_EXPORT int  ExeCreateSurfFrRectangle( int nParentId, const Point3d& ptIni, const Point3d& ptCross, int nRefType) ;
 EXE_EXPORT int  ExeCreateSurfFrRectangle3P( int nParentId, const Point3d& ptIni,
@@ -260,10 +260,10 @@ EXE_EXPORT int  ExeCreateSurfTmCone( int nParentId, const Point3d& ptOrig, const
 EXE_EXPORT int  ExeCreateSurfTmSphere( int nParentId, const Point3d& ptOrig,
                                        double dRad, double dLinTol, int nRefType) ;
 EXE_EXPORT int  ExeCreateSurfTmByFlatContour( int nParentId, int nCrvId, double dLinTol) ;
-EXE_EXPORT int  ExeCreateSurfTmByRegion( int nParentId, INTVECTOR& vCrvIds, double dLinTol) ;
-EXE_EXPORT int  ExeCreateSurfTmByExtrusion( int nParentId, INTVECTOR& vCrvIds, const Vector3d& vtExtr,
+EXE_EXPORT int  ExeCreateSurfTmByRegion( int nParentId, const INTVECTOR& vCrvIds, double dLinTol) ;
+EXE_EXPORT int  ExeCreateSurfTmByExtrusion( int nParentId, const INTVECTOR& vCrvIds, const Vector3d& vtExtr,
                                            double dLinTol, int nRefType) ;
-EXE_EXPORT int  ExeCreateSurfTmByRegionExtrusion( int nParentId, INTVECTOR& vCrvIds, const Vector3d& vtExtr,
+EXE_EXPORT int  ExeCreateSurfTmByRegionExtrusion( int nParentId, const INTVECTOR& vCrvIds, const Vector3d& vtExtr,
                                                   double dLinTol, int nRefType) ;
 EXE_EXPORT int  ExeCreateSurfTmByRevolve( int nParentId, int nCrvId,
                                           const Point3d& ptAx, const Vector3d& vtAx,
@@ -579,14 +579,14 @@ EXE_EXPORT bool ExeVectorToIdGlob( Vector3d& vtV, int nId) ;
 EXE_EXPORT bool ExeVectorToIdLoc( Vector3d& vtV, int nId) ;
 
 // Geo Transform
-EXE_EXPORT bool ExeTransform( INTVECTOR& vIds, const Frame3d& frRef, int nRefType) ;
-EXE_EXPORT bool ExeMove( INTVECTOR& vIds, const Vector3d& vtMove, int nRefType) ;
-EXE_EXPORT bool ExeRotate( INTVECTOR& vIds, const Point3d& ptAx, const Vector3d& vtAx,
+EXE_EXPORT bool ExeTransform( const INTVECTOR& vIds, const Frame3d& frRef, int nRefType) ;
+EXE_EXPORT bool ExeMove( const INTVECTOR& vIds, const Vector3d& vtMove, int nRefType) ;
+EXE_EXPORT bool ExeRotate( const INTVECTOR& vIds, const Point3d& ptAx, const Vector3d& vtAx,
                            double dAngRotDeg, int nRefType) ;
-EXE_EXPORT bool ExeScale( INTVECTOR& vIds, const Frame3d& frRef,
+EXE_EXPORT bool ExeScale( const INTVECTOR& vIds, const Frame3d& frRef,
                           double dCoeffX, double dCoeffY, double dCoeffZ, int nRefType) ;
-EXE_EXPORT bool ExeMirror( INTVECTOR& vIds, const Point3d& ptP, const Vector3d& vtN, int nRefType) ;
-EXE_EXPORT bool ExeShear( INTVECTOR& vIds, const Point3d& ptP, const Vector3d& vtN,
+EXE_EXPORT bool ExeMirror( const INTVECTOR& vIds, const Point3d& ptP, const Vector3d& vtN, int nRefType) ;
+EXE_EXPORT bool ExeShear( const INTVECTOR& vIds, const Point3d& ptP, const Vector3d& vtN,
                           const Vector3d& vtDir, double dCoeff, int nRefType) ;
 EXE_EXPORT bool ExeMoveGroup( int nId, const Vector3d& vtMove) ;
 EXE_EXPORT bool ExeRotateGroup( int nId, const Point3d& ptAx, const Vector3d& vtAx, double dAngRotDeg) ;
@@ -661,7 +661,7 @@ EXE_EXPORT double ExeCAvToolPosStm( const Point3d& ptP, const Vector3d& vtAx, in
 EXE_EXPORT bool ExeCAvToolPathStm( int nCrvId, const Vector3d& vtAx, int nSurfTmId, const Vector3d& vtMove, double dLinTol, int nRefType) ;
 
 // Machining
-EXE_EXPORT bool ExeInitMachMgr( const std::string& sMachinesDir) ;
+EXE_EXPORT bool ExeInitMachMgr( const std::string& sMachinesDir, const std::string& sToolMakersDir) ;
 EXE_EXPORT bool ExeUpdateMachMgr( void) ;
 EXE_EXPORT bool ExeInsertMachMgr( int nInsGrp) ;
 // Errors
@@ -760,6 +760,7 @@ EXE_EXPORT bool ExeTdbGetCurrToolParam( int nType, int& nVal) ;
 EXE_EXPORT bool ExeTdbGetCurrToolParam( int nType, double& dVal) ;
 EXE_EXPORT bool ExeTdbGetCurrToolParam( int nType, std::string& sVal) ;
 EXE_EXPORT bool ExeTdbGetCurrToolMaxDepth( double& dMaxDepth) ;
+EXE_EXPORT int  ExeTdbCurrToolDraw( int nGenCtx, int nToolCtx) ;
 EXE_EXPORT bool ExeTdbReload( void) ;
 EXE_EXPORT bool ExeTdbSave( void) ;
 EXE_EXPORT bool ExeTdbGetToolDir( std::string& sToolDir) ;