diff --git a/mesh.options b/mesh.options
index a3105cd..86d68d4 100644
--- a/mesh.options
+++ b/mesh.options
@@ -44,4 +44,7 @@
 
 
 #This value may want to be a few bytes smaller to compensate for the parent fields.
-*Compressed.data max_size:237
\ No newline at end of file
+*Compressed.data max_size:237
+
+*Location.name         max_size:40
+*Location.description  max_size:160
\ No newline at end of file
diff --git a/mesh.proto b/mesh.proto
index fcb372d..5fc072d 100644
--- a/mesh.proto
+++ b/mesh.proto
@@ -646,6 +646,16 @@ message Location {
    */
   bool locked = 5;
 
+  /*
+   * Name of the location - max 40 chars
+   */
+  string name = 6;
+
+  /**
+   * Description of the location - max 160 chars
+   */
+  string description = 7;
+
 }
 
 /*