diff --git a/ansys/api/geometry/v0/commands.proto b/ansys/api/geometry/v0/commands.proto
index 3b74ee7..9a8a3ca 100644
--- a/ansys/api/geometry/v0/commands.proto
+++ b/ansys/api/geometry/v0/commands.proto
@@ -499,16 +499,10 @@ message CommandResponse {
   bool success = 1;
   repeated Body created_bodies = 2;
   repeated Body modified_bodies = 3;
-  repeated Body deleted_bodies = 4;
-  repeated Face created_faces = 5;
-  repeated Face modified_faces = 6;
-  repeated Face deleted_faces = 7;
-  repeated Edge created_edges = 8;
-  repeated Edge modified_edges = 9;
-  repeated Edge deleted_edges = 10;
-  repeated Component created_components = 11;
-  repeated Component modified_components = 12;
-  repeated Component deleted_components = 13;
+  repeated Face created_faces = 4;
+  repeated Face modified_faces = 5;
+  repeated Edge created_edges = 6;
+  repeated Edge modified_edges = 7;
 }
 
 message FilletRequest {
diff --git a/ansys/api/geometry/v0/models.proto b/ansys/api/geometry/v0/models.proto
index 31aa16c..179e12a 100644
--- a/ansys/api/geometry/v0/models.proto
+++ b/ansys/api/geometry/v0/models.proto
@@ -313,7 +313,7 @@ message DuplicateCurveProblemArea {
 
 message SmallCurveProblemArea {
   int32 id = 1;
-  repeated string curve_point_monikers = 2;
+  repeated ansys.api.dbu.v0.EntityIdentifier curve_monikers = 2;
 }
 
 message AdjustSimplifyProblemArea {
@@ -321,6 +321,11 @@ message AdjustSimplifyProblemArea {
   repeated string body_monikers = 2;
 }
 
+message GapProblemArea {
+  int32 id = 1;
+  repeated ansys.api.dbu.v0.EntityIdentifier edge_monikers = 2;
+}
+
 message RepairToolMessage {
   bool success = 1;
   repeated string created_bodies_monikers = 2;
diff --git a/ansys/api/geometry/v0/repairtools.proto b/ansys/api/geometry/v0/repairtools.proto
index 0e4f5f1..364bf8c 100644
--- a/ansys/api/geometry/v0/repairtools.proto
+++ b/ansys/api/geometry/v0/repairtools.proto
@@ -54,6 +54,10 @@ service RepairTools{
 
   rpc FixGaps(FixGapsRequest) returns (FixGapsResponse);
 
+  rpc FindSmallCurves(FindSmallCurvesRequest) returns (FindSmallCurvesResponse);
+
+  rpc FixSmallCurves(FixSmallCurvesRequest) returns (FixSmallCurvesResponse);
+
   rpc FindCurveGaps(FindCurveGapsRequest) returns (FindCurveGapsResponse);
   
   rpc FixCurveGaps(FixCurveGapsRequest) returns (FixCurveGapsResponse);
@@ -243,27 +247,23 @@ message FixSmallFacesResponse{
 }
 
 message FindGapsRequest{
-  repeated string faces = 1;
+  repeated ansys.api.dbu.v0.EntityIdentifier bodies = 1;
   google.protobuf.DoubleValue angle=2;
   google.protobuf.DoubleValue distance = 3;
-  oneof method
-  {
-    google.protobuf.NullValue null = 4;
-    SolidifyFixMethodType  data =5;
-  }
-  google.protobuf.BoolValue allow_multi_patch = 6;
+  optional SolidifyFixMethodType fix_method = 4;
+  google.protobuf.BoolValue allow_multi_patch = 5;
 }
 
 message FindGapsResponse{
-  repeated ansys.api.geometry.v0.SplitEdgeProblemArea result = 1;
+  repeated ansys.api.geometry.v0.GapProblemArea result = 1;
 }
 
 message FixGapsRequest{
-  google.protobuf.Int32Value problemarea_id = 1;
+  google.protobuf.Int32Value gap_problem_area_id = 1;
 }
 
 message FixGapsResponse{
-  bool result = 1;
+  RepairToolMessage result = 1;
 }
 
 message FindCurveGapsRequest{
@@ -296,19 +296,19 @@ message FixDuplicateCurvesResponse{
 }
 
 message FindSmallCurvesRequest{
-  google.protobuf.DoubleValue distance = 1;
+  google.protobuf.DoubleValue max_curve_length = 1;
 }
 
 message FindSmallCurvesResponse{
-  repeated ansys.api.geometry.v0.DuplicateCurveProblemArea result = 1;
+  repeated ansys.api.geometry.v0.SmallCurveProblemArea result = 1;
 }
 
 message FixSmallCurvesRequest{
-  google.protobuf.Int32Value duplicate_curve_problem_area_id = 1;
+  google.protobuf.Int32Value small_curve_problem_area_id = 1;
 }
 
 message FixSmallCurvesResponse{
-  bool result = 1;
+  RepairToolMessage result = 1;
 }
 
 message FindAdjustMergeFacesRequest{