diff --git a/src/Mod/CAM/App/AreaPy.pyi b/src/Mod/CAM/App/AreaPy.pyi
index e22b2bc83d..6c2a62ca2d 100644
--- a/src/Mod/CAM/App/AreaPy.pyi
+++ b/src/Mod/CAM/App/AreaPy.pyi
@@ -1,5 +1,6 @@
-from typing import Final, Any
-from Base import object
+from typing import Any, Final
+
+from Base.BaseClass import BaseClass
 from Base.Metadata import export
 
 @export(
@@ -15,7 +16,7 @@ from Base.Metadata import export
     Constructor=True,
     Delete=True,
 )
-class AreaPy(object):
+class AreaPy(BaseClass):
     """
     FreeCAD python wrapper of libarea
 
diff --git a/src/Mod/CAM/App/CommandPy.pyi b/src/Mod/CAM/App/CommandPy.pyi
index 7623803d30..e9350af99b 100644
--- a/src/Mod/CAM/App/CommandPy.pyi
+++ b/src/Mod/CAM/App/CommandPy.pyi
@@ -1,6 +1,5 @@
-from Base import PersistencePy
-from Base.Metadata import export
-from Base.Metadata import constmethod, class_declarations
+from Base.Metadata import class_declarations, constmethod, export
+from Base.Persistence import Persistence
 from Base.Placement import Placement
 
 @export(
@@ -16,7 +15,7 @@ from Base.Placement import Placement
     Constructor=True,
 )
 @class_declarations("mutable Py::Dict parameters_copy_dict;")
-class CommandPy(PersistencePy):
+class CommandPy(Persistence):
     """
     Command([name],[parameters]): Represents a basic Gcode command
     name (optional) is the name of the command, ex. G1
diff --git a/src/Mod/CAM/App/FeatureAreaPy.pyi b/src/Mod/CAM/App/FeatureAreaPy.pyi
index 2d18829738..0a20e8c859 100644
--- a/src/Mod/CAM/App/FeatureAreaPy.pyi
+++ b/src/Mod/CAM/App/FeatureAreaPy.pyi
@@ -1,7 +1,9 @@
 from typing import Any
-from App import object
+
 from Base.Metadata import export
 
+from App.DocumentObject import DocumentObject
+
 @export(
     Father="DocumentObjectPy",
     Name="FeatureAreaPy",
@@ -12,7 +14,7 @@ from Base.Metadata import export
     FatherInclude="App/DocumentObjectPy.h",
     FatherNamespace="App",
 )
-class FeatureAreaPy(object):
+class FeatureAreaPy(DocumentObject):
     """
     This class handles Path Area features
     """
diff --git a/src/Mod/CAM/App/FeaturePathCompoundPy.pyi b/src/Mod/CAM/App/FeaturePathCompoundPy.pyi
index 2bdca04e36..7e0833a5a1 100644
--- a/src/Mod/CAM/App/FeaturePathCompoundPy.pyi
+++ b/src/Mod/CAM/App/FeaturePathCompoundPy.pyi
@@ -1,7 +1,9 @@
 from typing import Any
-from App import object
+
 from Base.Metadata import export
 
+from App.DocumentObject import DocumentObject
+
 @export(
     Father="DocumentObjectPy",
     Name="FeaturePathCompoundPy",
@@ -12,7 +14,7 @@ from Base.Metadata import export
     FatherInclude="App/DocumentObjectPy.h",
     FatherNamespace="App",
 )
-class FeaturePathCompoundPy(object):
+class FeaturePathCompoundPy(DocumentObject):
     """
     This class handles Path Compound features
     """
diff --git a/src/Mod/CAM/App/PathPy.pyi b/src/Mod/CAM/App/PathPy.pyi
index 0490b247f2..e5d9f405e4 100644
--- a/src/Mod/CAM/App/PathPy.pyi
+++ b/src/Mod/CAM/App/PathPy.pyi
@@ -1,7 +1,7 @@
-from typing import Final, Any
-from Base import object
-from Base.Metadata import export
-from Base.Metadata import constmethod
+from typing import Any, Final
+
+from Base.Metadata import constmethod, export
+from Base.Persistence import Persistence
 
 @export(
     Father="PersistencePy",
@@ -16,7 +16,7 @@ from Base.Metadata import constmethod
     Delete=True,
     Constructor=True,
 )
-class PathPy(object):
+class PathPy(Persistence):
     """
     Path([commands]): Represents a basic Gcode path
     commands (optional) is a list of Path commands
diff --git a/src/Mod/CAM/App/VoronoiCellPy.pyi b/src/Mod/CAM/App/VoronoiCellPy.pyi
index da6042bc0a..6978cf942f 100644
--- a/src/Mod/CAM/App/VoronoiCellPy.pyi
+++ b/src/Mod/CAM/App/VoronoiCellPy.pyi
@@ -1,7 +1,7 @@
-from typing import Final, Any
-from Base import object
-from Base.Metadata import export
-from Base.Metadata import constmethod
+from typing import Any, Final
+
+from Base.BaseClass import BaseClass
+from Base.Metadata import constmethod, export
 
 @export(
     Father="BaseClassPy",
@@ -13,18 +13,11 @@ from Base.Metadata import constmethod
     Namespace="Path",
     FatherInclude="Base/BaseClassPy.h",
     FatherNamespace="Base",
-    ReadOnly=[
-        "Index",
-        "SourceIndex",
-        "SourceCategory",
-        "SourceCategoryName",
-        "IncidentEdge",
-    ],
     Constructor=True,
     RichCompare=True,
     Delete=True,
 )
-class VoronoiCellPy(object):
+class VoronoiCellPy(BaseClass):
     """
     Cell of a Voronoi diagram
     """
diff --git a/src/Mod/CAM/App/VoronoiEdgePy.pyi b/src/Mod/CAM/App/VoronoiEdgePy.pyi
index 91e1bb3619..6ff72bf7a9 100644
--- a/src/Mod/CAM/App/VoronoiEdgePy.pyi
+++ b/src/Mod/CAM/App/VoronoiEdgePy.pyi
@@ -1,7 +1,7 @@
-from typing import Final, Any
-from Base import object
-from Base.Metadata import export
-from Base.Metadata import constmethod
+from typing import Any, Final
+
+from Base.BaseClass import BaseClass
+from Base.Metadata import constmethod, export
 
 @export(
     Father="BaseClassPy",
@@ -13,21 +13,11 @@ from Base.Metadata import constmethod
     Namespace="Path",
     FatherInclude="Base/BaseClassPy.h",
     FatherNamespace="Base",
-    ReadOnly=[
-        "Index",
-        "Cell",
-        "Vertices",
-        "Next",
-        "Prev",
-        "RotNext",
-        "RotPrev",
-        "Twin",
-    ],
     RichCompare=True,
     Constructor=True,
     Delete=True,
 )
-class VoronoiEdgePy(object):
+class VoronoiEdgePy(BaseClass):
     """
     Edge of a Voronoi diagram
     """
diff --git a/src/Mod/CAM/App/VoronoiPy.pyi b/src/Mod/CAM/App/VoronoiPy.pyi
index bbac06b9ba..9e9852d57d 100644
--- a/src/Mod/CAM/App/VoronoiPy.pyi
+++ b/src/Mod/CAM/App/VoronoiPy.pyi
@@ -1,7 +1,7 @@
-from typing import Final, Any
-from Base import object
-from Base.Metadata import export
-from Base.Metadata import constmethod
+from typing import Any, Final
+
+from Base.BaseClass import BaseClass
+from Base.Metadata import constmethod, export
 
 @export(
     Father="BaseClassPy",
@@ -16,7 +16,7 @@ from Base.Metadata import constmethod
     Constructor=True,
     Delete=True,
 )
-class VoronoiPy(object):
+class VoronoiPy(BaseClass):
     """
     Voronoi([segments]): Create voronoi for given collection of line segments
     """
diff --git a/src/Mod/CAM/App/VoronoiVertexPy.pyi b/src/Mod/CAM/App/VoronoiVertexPy.pyi
index 1009bcb4de..b36e3159df 100644
--- a/src/Mod/CAM/App/VoronoiVertexPy.pyi
+++ b/src/Mod/CAM/App/VoronoiVertexPy.pyi
@@ -1,7 +1,7 @@
-from typing import Final, Any
-from Base import object
-from Base.Metadata import export
-from Base.Metadata import constmethod
+from typing import Any, Final
+
+from Base.BaseClass import BaseClass
+from Base.Metadata import constmethod, export
 
 @export(
     Father="BaseClassPy",
@@ -13,12 +13,11 @@ from Base.Metadata import constmethod
     Namespace="Path",
     FatherInclude="Base/BaseClassPy.h",
     FatherNamespace="Base",
-    ReadOnly=["Index", "X", "Y", "IncidentEdge"],
     Constructor=True,
     RichCompare=True,
     Delete=True,
 )
-class VoronoiVertexPy(object):
+class VoronoiVertexPy(BaseClass):
     """
     Vertex of a Voronoi diagram
     """