diff --git a/src/core/ai_parting_detector.py b/src/core/ai_parting_detector.py
index 71d0eae..e8e6eec 100644
--- a/src/core/ai_parting_detector.py
+++ b/src/core/ai_parting_detector.py
@@ -71,14 +71,14 @@ class ShapeGraphBuilder:
             from OCC.Core.BRepBndLib import brepbndlib_Add
             from OCC.Core.TopTools import TopTools_IndexedDataMapOfShapeListOfShape
             from OCC.Core.TopExp import topexp_MapShapesAndAncestors
-            from OCC.Core.TopoDS import TopoDS_Face, TopoDS_Edge
+            from OCC.Core.TopoDS import TopoDS_Face, TopoDS_Edge, topods
 
             faces = []
             face_features = []
 
             explorer = TopExp_Explorer(shape, TopAbs_FACE)
             while explorer.More():
-                face = TopoDS_Face(explorer.Current())
+                face = topods.Face(explorer.Current())
                 features = self._extract_face_features(face)
                 if features is not None:
                     faces.append(face)
@@ -98,13 +98,13 @@ class ShapeGraphBuilder:
             edge_features_list = []
 
             for i in range(1, edge_map.Extent() + 1):
-                edge = TopoDS_Edge(edge_map.FindKey(i))
+                edge = topods.Edge(edge_map.FindKey(i))
                 face_list = edge_map.FindFromIndex(i)
 
                 connected_faces = []
                 it = face_list.begin()
                 while it != face_list.end():
-                    f = TopoDS_Face(it.Value())
+                    f = topods.Face(it.Value())
                     try:
                         idx = faces.index(f)
                         connected_faces.append(idx)
diff --git a/src/core/aluminum_foam_mold.py b/src/core/aluminum_foam_mold.py
index 06825c3..501d0f1 100644
--- a/src/core/aluminum_foam_mold.py
+++ b/src/core/aluminum_foam_mold.py
@@ -16,7 +16,7 @@ import numpy as np
 from OCC.Core.BRepBuilderAPI import BRepBuilderAPI_MakeFace
 from OCC.Core.BRepPrimAPI import BRepPrimAPI_MakeBox
 from OCC.Core.gp import gp_Pln, gp_Dir, gp_Pnt
-from OCC.Core.TopoDS import TopoDS_Face
+from OCC.Core.TopoDS import TopoDS_Face, topods
 from OCC.Core.BRepAdaptor import BRepAdaptor_Surface
 from OCC.Core.TopExp import TopExp_Explorer
 from OCC.Core.TopAbs import TopAbs_FACE
@@ -304,7 +304,7 @@ class AluminumFoamMoldGenerator(BaseMoldGenerator):
         explorer = TopExp_Explorer(shape, TopAbs_FACE)
 
         while explorer.More():
-            face = TopoDS_Face(explorer.Current())
+            face = topods.Face(explorer.Current())
             explorer.Next()
             try:
                 normal = self._get_face_normal(face)
diff --git a/src/core/base_mold_generator.py b/src/core/base_mold_generator.py
index 9499ed0..c40b5dc 100644
--- a/src/core/base_mold_generator.py
+++ b/src/core/base_mold_generator.py
@@ -6,7 +6,7 @@ from OCC.Core.BRepAlgoAPI import BRepAlgoAPI_Cut, BRepAlgoAPI_Section, BRepAlgoA
 from OCC.Core.BRepBuilderAPI import BRepBuilderAPI_MakeFace, BRepBuilderAPI_Transform
 from OCC.Core.BRepPrimAPI import BRepPrimAPI_MakeBox, BRepPrimAPI_MakeHalfSpace
 from OCC.Core.gp import gp_Pln, gp_Dir, gp_Pnt, gp_Trsf, gp_Ax2
-from OCC.Core.TopoDS import TopoDS_Face
+from OCC.Core.TopoDS import TopoDS_Face, topods
 from OCC.Core.BRep import BRep_Tool
 from OCC.Core.BRepMesh import BRepMesh_IncrementalMesh
 from OCC.Core.GProp import GProp_GProps
@@ -90,7 +90,7 @@ class BaseMoldGenerator:
         explorer = TopExp_Explorer(shape, TopAbs_FACE)
 
         while explorer.More():
-            face = TopoDS_Face(explorer.Current())
+            face = topods.Face(explorer.Current())
             normal = self._get_face_normal(face)
 
             if normal is not None:
@@ -477,7 +477,7 @@ class BaseMoldGenerator:
             face_idx = 0
 
             while explorer.More():
-                face = TopoDS_Face(explorer.Current())
+                face = topods.Face(explorer.Current())
                 face_idx += 1
 
                 try:
diff --git a/src/core/geometry_analyzer.py b/src/core/geometry_analyzer.py
index 938e12d..36781f4 100644
--- a/src/core/geometry_analyzer.py
+++ b/src/core/geometry_analyzer.py
@@ -235,7 +235,7 @@ class GeometryAnalyzer:
         try:
             from OCC.Core.TopExp import TopExp_Explorer
             from OCC.Core.TopAbs import TopAbs_FACE
-            from OCC.Core.TopoDS import TopoDS_Face
+            from OCC.Core.TopoDS import TopoDS_Face, topods
             from OCC.Core.BRepExtrema import BRepExtrema_DistShapeShape
             from OCC.Core.GProp import GProp_GProps
             from OCC.Core.BRepGProp import brepgprop
@@ -246,7 +246,7 @@ class GeometryAnalyzer:
             faces = []
             explorer = TopExp_Explorer(shape, TopAbs_FACE)
             while explorer.More():
-                faces.append(TopoDS_Face(explorer.Current()))
+                faces.append(topods.Face(explorer.Current()))
                 explorer.Next()
 
             if len(faces) < 2:
@@ -455,7 +455,7 @@ class GeometryAnalyzer:
         try:
             from OCC.Core.TopExp import TopExp_Explorer
             from OCC.Core.TopAbs import TopAbs_FACE
-            from OCC.Core.TopoDS import TopoDS_Face
+            from OCC.Core.TopoDS import TopoDS_Face, topods
             from OCC.Core.BRepAdaptor import BRepAdaptor_Surface
             from OCC.Core.BRepLProp import BRepLProp_SLProps
             from OCC.Core.gp import gp_Dir
@@ -468,7 +468,7 @@ class GeometryAnalyzer:
 
             explorer = TopExp_Explorer(shape, TopAbs_FACE)
             while explorer.More():
-                face = TopoDS_Face(explorer.Current())
+                face = topods.Face(explorer.Current())
                 surface = BRepAdaptor_Surface(face)
 
                 try:
@@ -522,7 +522,7 @@ class GeometryAnalyzer:
         try:
             from OCC.Core.TopExp import TopExp_Explorer
             from OCC.Core.TopAbs import TopAbs_FACE
-            from OCC.Core.TopoDS import TopoDS_Face
+            from OCC.Core.TopoDS import TopoDS_Face, topods
             from OCC.Core.BRepAdaptor import BRepAdaptor_Surface
             from OCC.Core.BRepLProp import BRepLProp_SLProps
             from OCC.Core.GProp import GProp_GProps
@@ -533,7 +533,7 @@ class GeometryAnalyzer:
 
             explorer = TopExp_Explorer(shape, TopAbs_FACE)
             while explorer.More():
-                face = TopoDS_Face(explorer.Current())
+                face = topods.Face(explorer.Current())
                 surface = BRepAdaptor_Surface(face)
 
                 if surface.GetType() == 0:
@@ -610,7 +610,7 @@ class GeometryAnalyzer:
         try:
             from OCC.Core.TopExp import TopExp_Explorer
             from OCC.Core.TopAbs import TopAbs_EDGE
-            from OCC.Core.TopoDS import TopoDS_Edge
+            from OCC.Core.TopoDS import TopoDS_Edge, topods
             from OCC.Core.BRepAdaptor import BRepAdaptor_Surface, BRepAdaptor_Curve
 
             fillet_count = 0
@@ -620,7 +620,7 @@ class GeometryAnalyzer:
 
             edge_explorer = TopExp_Explorer(shape, TopAbs_EDGE)
             while edge_explorer.More():
-                edge = TopoDS_Edge(edge_explorer.Current())
+                edge = topods.Edge(edge_explorer.Current())
                 try:
                     curve = BRepAdaptor_Curve(edge)
                     curve_type = curve.GetType()
diff --git a/src/core/mold_generator.py b/src/core/mold_generator.py
index a409202..6b70bd4 100644
--- a/src/core/mold_generator.py
+++ b/src/core/mold_generator.py
@@ -2,7 +2,7 @@ from typing import Dict, List, Any, Tuple, Optional
 import numpy as np
 from OCC.Core.BRepBuilderAPI import BRepBuilderAPI_MakeFace
 from OCC.Core.gp import gp_Pln, gp_Dir, gp_Pnt
-from OCC.Core.TopoDS import TopoDS_Face
+from OCC.Core.TopoDS import TopoDS_Face, topods
 from OCC.Core.BRepAdaptor import BRepAdaptor_Surface
 from OCC.Core.TopExp import TopExp_Explorer
 from OCC.Core.TopAbs import TopAbs_FACE
@@ -296,7 +296,7 @@ class MoldCavityGenerator(BaseMoldGenerator):
         explorer = TopExp_Explorer(shape, TopAbs_FACE)
 
         while explorer.More():
-            face = TopoDS_Face(explorer.Current())
+            face = topods.Face(explorer.Current())
             surface = BRepAdaptor_Surface(face)
 
             try:
diff --git a/src/core/multi_scheme_planner.py b/src/core/multi_scheme_planner.py
index dd3ae63..c92f7b3 100644
--- a/src/core/multi_scheme_planner.py
+++ b/src/core/multi_scheme_planner.py
@@ -6,7 +6,7 @@ from OCC.Core.GProp import GProp_GProps
 from OCC.Core.gp import gp_Dir, gp_Pln, gp_Pnt
 from OCC.Core.TopAbs import TopAbs_FACE
 from OCC.Core.TopExp import TopExp_Explorer
-from OCC.Core.TopoDS import TopoDS_Face
+from OCC.Core.TopoDS import TopoDS_Face, topods
 
 from core.mold_generator import MoldCavityGenerator
 from core.aluminum_foam_mold import AluminumFoamMoldGenerator
@@ -254,7 +254,7 @@ class MultiSchemeMoldPlanner:
         explorer = TopExp_Explorer(shape, TopAbs_FACE)
 
         while explorer.More():
-            face = TopoDS_Face(explorer.Current())
+            face = topods.Face(explorer.Current())
             explorer.Next()
 
             try:
diff --git a/src/core/side_action_designer.py b/src/core/side_action_designer.py
index 2e60f1b..f6c19d9 100644
--- a/src/core/side_action_designer.py
+++ b/src/core/side_action_designer.py
@@ -53,7 +53,7 @@ class UndercutDetector:
         try:
             from OCC.Core.TopExp import TopExp_Explorer
             from OCC.Core.TopAbs import TopAbs_FACE
-            from OCC.Core.TopoDS import TopoDS_Face
+            from OCC.Core.TopoDS import TopoDS_Face, topods
             from OCC.Core.BRepAdaptor import BRepAdaptor_Surface
             from OCC.Core.GProp import GProp_GProps
             from OCC.Core.BRepGProp import brepgprop
@@ -88,7 +88,7 @@ class UndercutDetector:
             face_idx = 0
 
             while explorer.More():
-                face = TopoDS_Face(explorer.Current())
+                face = topods.Face(explorer.Current())
                 face_idx += 1
 
                 try: