diff --git a/src/ansys/api/acp/v0/enum_types.proto b/src/ansys/api/acp/v0/enum_types.proto
index c7a5b81..03ce1cb 100644
--- a/src/ansys/api/acp/v0/enum_types.proto
+++ b/src/ansys/api/acp/v0/enum_types.proto
@@ -7,3 +7,14 @@ enum StatusType {
     UPTODATE = 1;
     NOTUPTODATE = 2;
 }
+
+enum RosetteSelectionMethod {
+    MINIMUM_ANGLE = 0;
+    MAXIMUM_ANGLE = 1;
+    MINIMUM_DISTANCE = 2;
+    MINIMUM_ANGLE_SUPERPOSED = 3;
+    MAXIMUM_ANGLE_SUPERPOSED = 4;
+    MINIMUM_DISTANCE_SUPERPOSED = 5;
+    ANSYS_CLASSIC = 6;
+    DIRECTIONS_FROM_TABULAR_VALUES = 7;
+}
diff --git a/src/ansys/api/acp/v0/material.proto b/src/ansys/api/acp/v0/material.proto
index c4de642..d191706 100644
--- a/src/ansys/api/acp/v0/material.proto
+++ b/src/ansys/api/acp/v0/material.proto
@@ -2,8 +2,11 @@ syntax = "proto3";
 package ansys.api.acp.v0.material;
 
 import "ansys/api/acp/v0/base.proto";
+import "ansys/api/acp/v0/enum_types.proto";
 
 message Properties {
+    enum_types.StatusType status = 1;
+    bool locked = 2;
 }
 
 message ObjectInfo {
diff --git a/src/ansys/api/acp/v0/model.proto b/src/ansys/api/acp/v0/model.proto
index b3c62f0..e28086d 100644
--- a/src/ansys/api/acp/v0/model.proto
+++ b/src/ansys/api/acp/v0/model.proto
@@ -3,31 +3,40 @@ package ansys.api.acp.v0.model;
 
 import "ansys/api/acp/v0/base.proto";
 
-enum Format {
-    ANSYS_H5 = 0;
-    ANSYS_CDB = 1;
-    ANSYS_DAT = 2;
-    ABAQUS_INP = 3;
-    NASTRAN_BDF = 4;
+// Default CRUD messages
+
+message Properties {
+    bool use_nodal_thicknesses = 1;
+    bool draping_offset_correction = 2;
+    bool use_default_section_tolerances = 3;
+    double angle_tolerance = 4;
+    double relative_thickness_tolerance = 5;
+    double minimum_analysis_ply_thickness = 6;
 }
 
 message ObjectInfo {
     base.BasicInfo info = 1;
-    message ModelingProperties {
-        bool use_nodal_thicknesses = 1;
-        bool draping_offset_correction = 2;
-        bool use_default_section_tolerances = 3;
-        double angle_tolerance = 4;
-        double relative_thickness_tolerance = 5;
-        double minimum_analysis_ply_thickness = 6;
-    }
-    ModelingProperties properties = 2;
+    Properties properties = 2;
+}
+
+message ListReply {
+    repeated ObjectInfo objects = 1;
 }
 
 message LoadFromFileRequest {
     string path = 1;
 }
 
+// Special Model messages
+
+enum Format {
+    ANSYS_H5 = 0;
+    ANSYS_CDB = 1;
+    ANSYS_DAT = 2;
+    ABAQUS_INP = 3;
+    NASTRAN_BDF = 4;
+}
+
 message LoadFromFEFileRequest {
     string path = 1;
     Format format = 2;
@@ -53,9 +62,6 @@ message SaveToFileRequest {
     bool save_cache = 3;
 }
 
-message ListReply {
-    repeated ObjectInfo objects = 1;
-}
 
 service ObjectService {
     rpc List(base.ListRequest) returns (ListReply);
diff --git a/src/ansys/api/acp/v0/oriented_selection_set.proto b/src/ansys/api/acp/v0/oriented_selection_set.proto
index 0c5c13a..ff52788 100644
--- a/src/ansys/api/acp/v0/oriented_selection_set.proto
+++ b/src/ansys/api/acp/v0/oriented_selection_set.proto
@@ -3,10 +3,18 @@ package ansys.api.acp.v0.oriented_selection_set;
 
 import "ansys/api/acp/v0/base.proto";
 import "ansys/api/acp/v0/enum_types.proto";
+import "ansys/api/acp/v0/array_types.proto";
 
 message Properties {
     enum_types.StatusType status = 1;
     repeated base.ResourcePath element_sets = 2;
+    array_types.DoubleArray orientation_point = 3;
+    array_types.DoubleArray orientation_direction = 4;
+    repeated base.ResourcePath rosettes = 5;
+    enum_types.RosetteSelectionMethod rosette_selection_method = 6;
+    // TODO: tabular values
+    // TODO: selection rules
+    // TODO: draping
 }
 
 message ObjectInfo {