diff --git a/proto/cmp/types/v1alpha1/baggage.proto b/proto/cmp/types/v1alpha1/baggage.proto
index 262b8bf4..b5b9293e 100644
--- a/proto/cmp/types/v1alpha1/baggage.proto
+++ b/proto/cmp/types/v1alpha1/baggage.proto
@@ -2,6 +2,8 @@ syntax = "proto3";
 
 package cmp.types.v1alpha1;
 
+import "cmp/types/v1alpha1/measurement.proto";
+
 // Baggage message type
 //
 // ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha1/baggage.proto.dot.xs.svg)
@@ -12,22 +14,14 @@ message Baggage {
   // Enum of allowed baggage types.
   BaggageType baggage_type = 1;
 
-  // maximum number of the specified bagage type allowed
-  int32 max_baggage = 2;
-
-  // maximum weith of each of the specified bagage type allowed
-  int32 max_baggage_weight = 3;
+  // Maximum number of the specified baggage count allowed for this type
+  int32 max_count = 2;
 
-  // Dimensions
-  //
-  // Dimensions unit specification for length, width and height (cm or inches)
-  DimensionType dimension_type = 5;
+  // Maximum weith of each of the specified bagage type allowed
+  Weight max_weight = 3;
 
-  // maximum height of the specified bagage type allowed
-  // maximum length, width and height of the specified bagage type allowed
-  int32 max_baggage_length = 6;
-  int32 max_baggage_width = 7;
-  int32 max_baggage_height = 8;
+  // Maximum length, width and height of the specified bagage type allowed
+  Dimension max_dimension = 4;
 }
 
 // Baggage type ENUM type
@@ -42,10 +36,3 @@ enum BaggageType {
   BAGGAGE_TYPE_GOLF = 7; // Golf bags
   BAGGAGE_TYPE_SURF = 8; // (wind)Surf or Kite boards
 }
-
-// Baggage dimensions unit ENUM type
-enum DimensionType {
-  DIMENSION_TYPE_UNSPECIFIED = 0; // No Baggage dimensions unit specified
-  DIMENSION_TYPE_CM = 1; // Centimeters
-  DIMENSION_TYPE_INCH = 2; // Inches
-}
\ No newline at end of file
diff --git a/proto/cmp/types/v1alpha1/measurement.proto b/proto/cmp/types/v1alpha1/measurement.proto
index c55e84d2..3c18d7a8 100644
--- a/proto/cmp/types/v1alpha1/measurement.proto
+++ b/proto/cmp/types/v1alpha1/measurement.proto
@@ -11,6 +11,14 @@ message Length {
   LengthUnit unit = 2;
 }
 
+// Represents a dimension type, for example, to be used in baggage message type
+message Dimension {
+  int32 length = 1;
+  int32 width = 2;
+  int32 height = 3;
+  LengthUnit unit = 4;
+}
+
 // Length Unit
 enum LengthUnit {
   LENGTH_UNIT_UNSPECIFIED = 0;
@@ -26,7 +34,7 @@ enum LengthUnit {
 
 // Weight type
 //
-// Used for weight
+// Ex: Used for weight in baggage message type
 message Weight {
   int32 value = 1;
   WeightUnit unit = 2;
@@ -37,4 +45,5 @@ enum WeightUnit {
   WEIGHT_UNIT_UNSPECIFIED = 0;
   WEIGHT_UNIT_GRAM = 1;
   WEIGHT_UNIT_KILOGRAM = 2;
+  WEIGHT_UNIT_POUND = 3;
 }