diff --git a/.gitignore b/.gitignore
index 2227357..71feede 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,6 @@ MANIFEST
 # autogenerated Python code
 *pb2*.py
 *pb2*.pyi
+
+#Pycharm settings
+.idea
diff --git a/src/ansys/api/acp/v0/array_types.proto b/src/ansys/api/acp/v0/array_types.proto
index 02e31bf..83b9849 100644
--- a/src/ansys/api/acp/v0/array_types.proto
+++ b/src/ansys/api/acp/v0/array_types.proto
@@ -4,4 +4,9 @@ package ansys.api.acp.v0.array_types;
 message DoubleArray {
   repeated int64 shape = 1 [packed=true];
   repeated double data = 2 [packed=true];
+}
+
+message IntArray {
+    repeated int64 data = 1 [packed=true];
+    repeated int64 shape = 2 [packed=true];
 }
\ No newline at end of file
diff --git a/src/ansys/api/acp/v0/element_set.proto b/src/ansys/api/acp/v0/element_set.proto
index 9b71def..02563a5 100644
--- a/src/ansys/api/acp/v0/element_set.proto
+++ b/src/ansys/api/acp/v0/element_set.proto
@@ -1,19 +1,30 @@
 syntax = "proto3";
-package ansys.api.acp.v0;
+package ansys.api.acp.v0.element_set;
 
 import "ansys/api/acp/v0/base.proto";
+import "ansys/api/acp/v0/array_types.proto";
+import "ansys/api/acp/v0/enum_types.proto";
 
 message ElementSetRequest {
     ResourcePath resource_path = 1;
     // TODO: add a 'view' that determines which parts are returned
 }
 
+message ElementSetProperties {
+    enum_types.StatusType status = 1;
+    bool locked = 2;
+    bool middle_offset = 3;
+    array_types.IntArray element_labels = 4;
+}
+
 message ElementSetReply {
     BasicInfo info = 1;
+    ElementSetProperties properties = 2;
 }
 
 message PutElementSetRequest {
     BasicInfo info = 1;
+    ElementSetProperties properties = 2;
 }
 
 message DeleteElementSetRequest {
@@ -31,6 +42,8 @@ message ListElementSetsReply {
 message CreateElementSetRequest {
     CollectionPath collection_path = 1;
     string name = 2;
+    ElementSetProperties properties = 3;
+
 }
 
 service ElementSet {
diff --git a/src/ansys/api/acp/v0/enum_types.proto b/src/ansys/api/acp/v0/enum_types.proto
index 5cdca3d..8623c94 100644
--- a/src/ansys/api/acp/v0/enum_types.proto
+++ b/src/ansys/api/acp/v0/enum_types.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package ansys.api.acp.v0;
+package ansys.api.acp.v0.enum_types;
 
 //the initializers are different in the backend but here it has to be zero-based
 enum StatusType {
diff --git a/src/ansys/api/acp/v0/rosette.proto b/src/ansys/api/acp/v0/rosette.proto
index 9061bf6..ae41531 100644
--- a/src/ansys/api/acp/v0/rosette.proto
+++ b/src/ansys/api/acp/v0/rosette.proto
@@ -18,7 +18,7 @@ message RosetteRequest {
 }
 
 message RosetteProperties {
-    StatusType status = 1;
+    enum_types.StatusType status = 1;
     bool locked = 2;
     Type rosette_type = 3;
     array_types.DoubleArray origin = 4;