diff --git a/src/IGESCAFControl/IGESCAFControl.cdl b/src/IGESCAFControl/IGESCAFControl.cdl
index 0ce0f5a4e8..15f507673e 100755
--- a/src/IGESCAFControl/IGESCAFControl.cdl
+++ b/src/IGESCAFControl/IGESCAFControl.cdl
@@ -30,6 +30,7 @@ uses
     TopoDS,
     TopTools,
     TDocStd,
+    TDF,
     XCAFDoc,
     XCAFPrs,
     XSControl,
diff --git a/src/IGESCAFControl/IGESCAFControl_Writer.cdl b/src/IGESCAFControl/IGESCAFControl_Writer.cdl
index 446eb5ee44..47c15c7061 100755
--- a/src/IGESCAFControl/IGESCAFControl_Writer.cdl
+++ b/src/IGESCAFControl/IGESCAFControl_Writer.cdl
@@ -46,6 +46,7 @@ uses
     MapOfShape from TopTools,
     WorkSession from XSControl,
     Document from TDocStd,
+    LabelSequence from TDF,
     Style from XCAFPrs,
     DataMapOfShapeStyle from XCAFPrs,
     DataMapOfStyleTransient from XCAFPrs
@@ -76,7 +77,12 @@ is
 
     ---Scope: Internal methods
 
-    WriteAttributes (me: in out; doc: Document from TDocStd) 
+    Transfer (me : in out; labels: LabelSequence from TDF)
+    returns Boolean is protected;
+    	---Purpose: Transfers labels to a IGES model
+    	--          Returns True if translation is OK
+
+    WriteAttributes (me: in out; labels: LabelSequence from TDF) 
     returns Boolean is protected;
     	---Purpose: Reads colors from DECAF document and assigns them
 	--          to corresponding IGES entities
@@ -88,12 +94,12 @@ is
 	---Purpose: Recursively iterates on subshapes and assigns colors
 	--          to faces and edges (if set)
 
-    WriteLayers (me: in out; doc: Document from TDocStd) 
+    WriteLayers (me: in out; labels: LabelSequence from TDF) 
     returns Boolean is protected;
     	---Purpose: Reads layers from DECAF document and assigns them
 	--          to corresponding IGES entities
 
-    WriteNames (me: in out; doc: Document from TDocStd)
+    WriteNames (me: in out; labels: LabelSequence from TDF)
     returns Boolean is protected;
     	---Purpose: Recursivile iterates on subshapes and assign names 
     	--          to IGES entity
diff --git a/src/IGESCAFControl/IGESCAFControl_Writer.cxx b/src/IGESCAFControl/IGESCAFControl_Writer.cxx
index 02c4ddef41..f83c0f4923 100755
--- a/src/IGESCAFControl/IGESCAFControl_Writer.cxx
+++ b/src/IGESCAFControl/IGESCAFControl_Writer.cxx
@@ -88,35 +88,13 @@ Standard_Boolean IGESCAFControl_Writer::Transfer (const Handle(TDocStd_Document)
 {  
   // translate free top-level shapes of the DECAF document
   Handle(XCAFDoc_ShapeTool) STool = XCAFDoc_DocumentTool::ShapeTool( doc->Main() );
-  TDF_LabelSequence shapes;
-  STool->GetFreeShapes ( shapes );
-  if ( shapes.Length() <=0 ) return Standard_False;
-  for ( Standard_Integer i=1; i <= shapes.Length(); i++ ) {
-    TopoDS_Shape shape = STool->GetShape ( shapes.Value(i) );
-    if ( ! shape.IsNull() ) 
-      AddShape ( shape );
-//      IGESControl_Writer::Transfer ( shape );
-  }
-  
-  // write colors
-  if ( GetColorMode() )
-    WriteAttributes ( doc );
+  if ( STool.IsNull() ) return Standard_False;
 
-  // write layers
-  if ( GetLayerMode() )
-    WriteLayers ( doc );
+  TDF_LabelSequence labels;
+  STool->GetFreeShapes ( labels );
+  return Transfer (labels);
+}  
   
-  // write names
-  if ( GetNameMode() )
-    WriteNames( doc );
-  
-  // refresh graph
-//  WS()->ComputeGraph ( Standard_True );
-  ComputeModel();
-  
-  return Standard_True;
-}
-
 //=======================================================================
 //function : Perform
 //purpose  : 
@@ -141,18 +119,48 @@ Standard_Boolean IGESCAFControl_Writer::Perform (const Handle(TDocStd_Document)
   return Write ( filename.ToCString() ) == IFSelect_RetDone;
 }
   
+//=======================================================================
+//function : Transfer
+//purpose  : 
+//=======================================================================
+
+Standard_Boolean IGESCAFControl_Writer::Transfer (const TDF_LabelSequence& labels)
+{  
+  if ( labels.Length() <=0 ) return Standard_False;
+  for ( Standard_Integer i=1; i <= labels.Length(); i++ ) {
+    TopoDS_Shape shape = XCAFDoc_ShapeTool::GetShape ( labels.Value(i) );
+    if ( ! shape.IsNull() ) 
+      AddShape ( shape );
+//      IGESControl_Writer::Transfer ( shape );
+  }
+  
+  // write colors
+  if ( GetColorMode() )
+    WriteAttributes ( labels );
+
+  // write layers
+  if ( GetLayerMode() )
+    WriteLayers ( labels );
+  
+  // write names
+  if ( GetNameMode() )
+    WriteNames( labels );
+  
+  // refresh graph
+//  WS()->ComputeGraph ( Standard_True );
+  ComputeModel();
+  
+  return Standard_True;
+}
+
 //=======================================================================
 //function : WriteAttributes
 //purpose  : 
 //=======================================================================
 
-Standard_Boolean IGESCAFControl_Writer::WriteAttributes (const Handle(TDocStd_Document)& Doc) 
+Standard_Boolean IGESCAFControl_Writer::WriteAttributes (const TDF_LabelSequence& labels) 
 {
-  // Iterate on shapes in the document
-  Handle(XCAFDoc_ShapeTool) STool = XCAFDoc_DocumentTool::ShapeTool( Doc->Main() );
-
-  TDF_LabelSequence labels;
-  STool->GetFreeShapes ( labels );
+  // Iterate on labels
   if ( labels.Length() <=0 ) return Standard_False;
   for ( Standard_Integer i=1; i <= labels.Length(); i++ ) {
     TDF_Label L = labels.Value(i);
@@ -166,7 +174,7 @@ Standard_Boolean IGESCAFControl_Writer::WriteAttributes (const Handle(TDocStd_Do
     // get a target shape and try to find corresponding context
     // (all the colors set under that label will be put into that context)
     TopoDS_Shape S;
-    if ( ! STool->GetShape ( L, S ) ) continue;
+    if ( ! XCAFDoc_ShapeTool::GetShape ( L, S ) ) continue;
         
     // iterate on subshapes and create IGES styles 
     XCAFPrs_DataMapOfStyleTransient colors;
@@ -341,11 +349,12 @@ static void MakeLayers (const Handle(Transfer_FinderProcess) &FP,
 //purpose  : 
 //=======================================================================
 
-Standard_Boolean IGESCAFControl_Writer::WriteLayers (const Handle(TDocStd_Document)& Doc) 
+Standard_Boolean IGESCAFControl_Writer::WriteLayers (const TDF_LabelSequence& labels) 
 {
-  Handle(XCAFDoc_ShapeTool) STool = XCAFDoc_DocumentTool::ShapeTool( Doc->Main() );
+  if ( labels.Length() <=0 ) return Standard_False;
+  Handle(XCAFDoc_ShapeTool) STool = XCAFDoc_DocumentTool::ShapeTool( labels(1) );
   if ( STool.IsNull() ) return Standard_False;
-  Handle(XCAFDoc_LayerTool) LTool = XCAFDoc_DocumentTool::LayerTool( Doc->Main() );
+  Handle(XCAFDoc_LayerTool) LTool = XCAFDoc_DocumentTool::LayerTool( labels(1) );
   if ( LTool.IsNull() ) return Standard_False;
   
   Standard_Integer globalIntName = 0;
@@ -395,9 +404,10 @@ Standard_Boolean IGESCAFControl_Writer::WriteLayers (const Handle(TDocStd_Docume
 //purpose  : 
 //=======================================================================
 
-Standard_Boolean IGESCAFControl_Writer::WriteNames (const Handle(TDocStd_Document)& Doc) 
+Standard_Boolean IGESCAFControl_Writer::WriteNames (const TDF_LabelSequence& labels) 
 {
-  Handle(XCAFDoc_ShapeTool) STool = XCAFDoc_DocumentTool::ShapeTool( Doc->Main() );
+  if ( labels.Length() <=0 ) return Standard_False;
+  Handle(XCAFDoc_ShapeTool) STool = XCAFDoc_DocumentTool::ShapeTool( labels(1) );
   if ( STool.IsNull() ) return Standard_False;
   TDF_ChildIterator labelShIt(STool->BaseLabel() , Standard_True);
   for (; labelShIt.More(); labelShIt.Next() ) {