diff --git a/EGkGeoObj.h b/EGkGeoObj.h
index 3cfcf4a..14ad9a4 100644
--- a/EGkGeoObj.h
+++ b/EGkGeoObj.h
@@ -37,7 +37,7 @@ class _declspec( novtable) IGeoObj
       virtual const std::string& GetKey( void) const = 0 ;
       virtual bool IsValid( void) const = 0 ;
       virtual bool Save( std::ostream& osOut) const = 0 ;
-      virtual bool Load( CScan& TheScanner) = 0 ;
+      virtual bool Load( Scanner& TheScanner) = 0 ;
       virtual bool Translate( const Vector3d& vtMove) = 0 ;
       virtual bool Rotate( const Point3d& ptAx, const Vector3d& vtAx, double dCosAng, double dSinAng) = 0 ;
       virtual bool Rotate( const Point3d& ptAx, const Vector3d& vtAx, double dAngRad) = 0 ;
diff --git a/EGkGeomDB.h b/EGkGeomDB.h
index 6d667cf..67a7f3a 100644
--- a/EGkGeomDB.h
+++ b/EGkGeomDB.h
@@ -34,8 +34,8 @@ class _declspec( novtable) IGeomDB
       virtual bool Init( ILogger* pLogger) = 0 ;
       virtual bool ReInit( void) = 0 ;
       virtual bool Clear( void) = 0 ;
-      virtual bool Load( std::ifstream& osIn) = 0 ;
-      virtual bool Save( std::ofstream& osOut) const = 0 ;
+      virtual bool Load( const std::string& sFileIn) = 0 ;
+      virtual bool Save( const std::string& sFileOut) const = 0 ;
       virtual bool ExistsNode( int nId) const = 0 ;
       virtual int  AddGroup( int nId, int nParentId, const Frame3d& frFrame) = 0 ;
       virtual int  AddGeoObj( int nId, int nParentId, IGeoObj* pGeoObj) = 0 ;
diff --git a/EGnScan.h b/EGnScan.h
index 1c7336a..5e9d3d6 100644
--- a/EGnScan.h
+++ b/EGnScan.h
@@ -25,17 +25,20 @@
 #endif
 
 //----------------------------------------------------------------------------
-class EGN_EXPORT CScan
+class Scanner
 {
    public :
-      CScan( void) ;
-      ~CScan( void) ;
-      bool Init( std::ifstream& InFile) ;
-      bool Terminate( void) ;
-      bool GetLine( std::string& sLine) ;
-      int  GetCurrLineNbr( void) { return m_nLineNbr ; }
+      EGN_EXPORT Scanner( void) ;
+      EGN_EXPORT ~Scanner( void) ;
+      EGN_EXPORT bool Init( const std::string& sCmdFile, const char* szRemInit = NULL) ;
+      EGN_EXPORT bool Terminate( void) ;
+      EGN_EXPORT bool GetLine( std::string& sLine) ;
+      EGN_EXPORT int  GetCurrLineNbr( void) { return m_nLineNbr ; }
+      EGN_EXPORT const std::string& GetFilePath( void) { return m_sFName ; }
 
    private :
-      std::ifstream* m_pInFile ;
-      int            m_nLineNbr ;
+      std::ifstream m_InFile ;
+      std::string   m_sFName ;
+      std::string   m_sRemInit ;
+      int           m_nLineNbr ;
 } ;