diff --git a/EGnFileUtils.h b/EGnFileUtils.h
index 0ca9ffd..39c1ba0 100644
--- a/EGnFileUtils.h
+++ b/EGnFileUtils.h
@@ -42,3 +42,4 @@ EGN_EXPORT bool ExistsDirectory( const std::string& sDir) ;
 EGN_EXPORT bool CreateDirectoryEgt( const std::string& sDir) ;
 EGN_EXPORT bool EmptyDirectory( const std::string& sDir) ;
 EGN_EXPORT bool EraseDirectory( const std::string& sDir) ;
+EGN_EXPORT bool FindAllDirectories( const std::string& sDirSpec, STRVECTOR& vsDirNames) ;
diff --git a/EInAPI.h b/EInAPI.h
index 5f83870..ce2d70c 100644
--- a/EInAPI.h
+++ b/EInAPI.h
@@ -693,8 +693,10 @@ EIN_EXPORT wchar_t* __stdcall EgtGetLastMachMgrErrorString( void) ;
 EIN_EXPORT int __stdcall EgtGetMachMgrWarningId( int nInd) ;
 EIN_EXPORT wchar_t* __stdcall EgtGetMachMgrWarningString( int nInd) ;
 // Machines
+EIN_EXPORT BOOL __stdcall EgtGetMachines( wchar_t*& wsMachineNames, wchar_t*& wsMachineDirs) ;
 EIN_EXPORT BOOL __stdcall EgtSetCurrMachine( const wchar_t* wsMachineName) ;
 EIN_EXPORT BOOL __stdcall EgtGetCurrMachineName( wchar_t*& wsMachineName) ;
+EIN_EXPORT BOOL __stdcall EgtGetCurrMachineDir( wchar_t*& wsMachineDir) ;
 // Machining Groups
 EIN_EXPORT int  __stdcall EgtGetMachGroupCount( void) ;
 EIN_EXPORT int  __stdcall EgtGetFirstMachGroup( void) ;
diff --git a/EMkMachMgr.h b/EMkMachMgr.h
index 527f480..57db47e 100644
--- a/EMkMachMgr.h
+++ b/EMkMachMgr.h
@@ -43,6 +43,7 @@ class __declspec( novtable) IMachMgr
       virtual int  GetWarningId( int nInd) const = 0 ;
       virtual std::string GetWarningString( int nInd) const = 0 ;
      // Machines
+      virtual bool GetMachines( STRVECTOR& vsMachineNames, STRVECTOR& vsMachineDirs) const = 0 ;
       virtual bool SetCurrMachine( const std::string& sMachineName) = 0 ;
       virtual bool GetCurrMachineName( std::string& sMachineName) const = 0 ;
       virtual bool GetCurrMachineDir( std::string& sMachineDir) const = 0 ;
diff --git a/EXeExecutor.h b/EXeExecutor.h
index 232b959..e59b7fe 100644
--- a/EXeExecutor.h
+++ b/EXeExecutor.h
@@ -852,6 +852,7 @@ EXE_EXPORT std::string ExeGetLastMachMgrErrorString( void) ;
 EXE_EXPORT int  ExeGetMachMgrWarningId( int nInd) ;
 EXE_EXPORT std::string ExeGetMachMgrWarningString( int nInd) ;
 // Machines
+EXE_EXPORT bool ExeGetMachines( STRVECTOR& vsMachineNames, STRVECTOR& vsMachineDirs) ;
 EXE_EXPORT bool ExeSetCurrMachine( const std::string& sMachineName) ;
 EXE_EXPORT bool ExeGetCurrMachineName( std::string& sMachineName) ;
 EXE_EXPORT bool ExeGetCurrMachineDir( std::string& sMachineDir) ;