diff --git a/ocp.toml b/ocp.toml
index a5b70dcc..433e297c 100644
--- a/ocp.toml
+++ b/ocp.toml
@@ -1367,12 +1367,21 @@ exclude_collection = [
 "List_IVtk_PointId",
 "ForwardRangeIterator_TopExp_Explorer",
 "ForwardRangeIterator_TopoDS_Iterator",
-"IndexedMap_const Graphic3d_CStructure"
+"IndexedMap_const Graphic3d_CStructure",
+"Array1_SelectMgr_BVHThreadPool :: BVHThread",
+"DynamicArray_IntPatch_BVHTraversal :: TrianglePair",
+"List_Poly_CoherentTriangulation :: TwoIntegers",
+"DataMap_TopoDS_Shape_TNaming_PtrRefShape",
+"IndexedMap_Graphic3d_CView",
+"IndexedDataMap_TCollection_AsciiString_Aspect_XRAction"
 ]
 
 collection_pattern = "NCollection"
-collection_include_header_pre = """#include <BRepExtrema_ProximityDistTool.hxx>
-#include <gp_XYZ.hxx>"""
+collection_include_header_pre_top = """#include <BRepExtrema_ProximityDistTool.hxx>
+#include <gp_XYZ.hxx>
+
+class OpenGl_ShaderProgram;
+"""
 
 module_mapping = "lambda x: Path(x).splitpath()[-1].split('.')[0].split('_')[0]"
 
diff --git a/pywrap b/pywrap
index 455cd2a0..b2a88cce 160000
--- a/pywrap
+++ b/pywrap
@@ -1 +1 @@
-Subproject commit 455cd2a07852fa82de881e0de464f37981da6a64
+Subproject commit b2a88ccec5123cdbecfc45731112301422a7f25a
diff --git a/tests/test_ocp.py b/tests/test_ocp.py
index 935af600..91b93a63 100644
--- a/tests/test_ocp.py
+++ b/tests/test_ocp.py
@@ -3,7 +3,7 @@
 
 from OCP.BRepPrimAPI import BRepPrimAPI_MakeBox
 from OCP.TopoDS import TopoDS_Shape
-from OCP import List_TopoDS_Shape
+from OCP.collections import List_TopoDS_Shape
 
 # %% TopoDS_Shape
 
@@ -134,7 +134,7 @@ def test_roundtrip():
 
 from OCP.BRepBuilderAPI import BRepBuilderAPI_MakeEdge
 from OCP.ShapeAnalysis import ShapeAnalysis_FreeBounds
-from OCP import HSequence_TopoDS_Shape
+from OCP.collections import HSequence_TopoDS_Shape
 from OCP.gp import gp_Pnt