diff --git a/src/btstack_defines.h b/src/btstack_defines.h
index b9115c48a..297fb703f 100644
--- a/src/btstack_defines.h
+++ b/src/btstack_defines.h
@@ -2251,17 +2251,45 @@ typedef uint8_t sm_key_t[16];
 /**
  * @format 12
  * @param subevent_code
- * @param goep_cid
+ * @param map_cid
 */
 #define MAP_SUBEVENT_CONNECTION_CLOSED                                    0x02
 
 /**
  * @format 121
  * @param subevent_code
- * @param goep_cid
+ * @param map_cid
  * @param status
  */
 #define MAP_SUBEVENT_OPERATION_COMPLETED                                  0x03
 
 
+/**
+ * @format 12LV
+ * @param subevent_code
+ * @param map_cid
+ * @param name_len
+ * @param name
+ */
+#define MAP_SUBEVENT_FOLDER_LISTING_ITEM                                  0x04
+
+/**
+ * @format 12D
+ * @param subevent_code
+ * @param map_cid
+ * @param handle
+
+ */
+#define MAP_SUBEVENT_MESSAGE_LISTING_ITEM                                 0x05
+
+/**
+ * @format 12
+ * @param subevent_code
+ * @param map_cid
+ */
+#define MAP_SUBEVENT_PARSING_DONE                                         0x06
+
+
+
+
 #endif
diff --git a/src/btstack_event.h b/src/btstack_event.h
index 471b1e03f..207b29de1 100644
--- a/src/btstack_event.h
+++ b/src/btstack_event.h
@@ -7031,22 +7031,22 @@ static inline uint8_t map_subevent_connection_opened_get_incoming(const uint8_t
 }
 
 /**
- * @brief Get field goep_cid from event MAP_SUBEVENT_CONNECTION_CLOSED
+ * @brief Get field map_cid from event MAP_SUBEVENT_CONNECTION_CLOSED
  * @param event packet
- * @return goep_cid
+ * @return map_cid
  * @note: btstack_type 2
  */
-static inline uint16_t map_subevent_connection_closed_get_goep_cid(const uint8_t * event){
+static inline uint16_t map_subevent_connection_closed_get_map_cid(const uint8_t * event){
     return little_endian_read_16(event, 3);
 }
 
 /**
- * @brief Get field goep_cid from event MAP_SUBEVENT_OPERATION_COMPLETED
+ * @brief Get field map_cid from event MAP_SUBEVENT_OPERATION_COMPLETED
  * @param event packet
- * @return goep_cid
+ * @return map_cid
  * @note: btstack_type 2
  */
-static inline uint16_t map_subevent_operation_completed_get_goep_cid(const uint8_t * event){
+static inline uint16_t map_subevent_operation_completed_get_map_cid(const uint8_t * event){
     return little_endian_read_16(event, 3);
 }
 /**
@@ -7059,6 +7059,63 @@ static inline uint8_t map_subevent_operation_completed_get_status(const uint8_t
     return event[5];
 }
 
+/**
+ * @brief Get field map_cid from event MAP_SUBEVENT_FOLDER_LISTING_ITEM
+ * @param event packet
+ * @return map_cid
+ * @note: btstack_type 2
+ */
+static inline uint16_t map_subevent_folder_listing_item_get_map_cid(const uint8_t * event){
+    return little_endian_read_16(event, 3);
+}
+/**
+ * @brief Get field name_len from event MAP_SUBEVENT_FOLDER_LISTING_ITEM
+ * @param event packet
+ * @return name_len
+ * @note: btstack_type L
+ */
+static inline int map_subevent_folder_listing_item_get_name_len(const uint8_t * event){
+    return little_endian_read_16(event, 5);
+}
+/**
+ * @brief Get field name from event MAP_SUBEVENT_FOLDER_LISTING_ITEM
+ * @param event packet
+ * @return name
+ * @note: btstack_type V
+ */
+static inline const uint8_t * map_subevent_folder_listing_item_get_name(const uint8_t * event){
+    return &event[7];
+}
+
+/**
+ * @brief Get field map_cid from event MAP_SUBEVENT_MESSAGE_LISTING_ITEM
+ * @param event packet
+ * @return map_cid
+ * @note: btstack_type 2
+ */
+static inline uint16_t map_subevent_message_listing_item_get_map_cid(const uint8_t * event){
+    return little_endian_read_16(event, 3);
+}
+/**
+ * @brief Get field handle from event MAP_SUBEVENT_MESSAGE_LISTING_ITEM
+ * @param event packet
+ * @return handle
+ * @note: btstack_type D
+ */
+static inline const uint8_t * map_subevent_message_listing_item_get_handle(const uint8_t * event){
+    return (const uint8_t *) &event[5];
+}
+
+/**
+ * @brief Get field map_cid from event MAP_SUBEVENT_PARSING_DONE
+ * @param event packet
+ * @return map_cid
+ * @note: btstack_type 2
+ */
+static inline uint16_t map_subevent_parsing_done_get_map_cid(const uint8_t * event){
+    return little_endian_read_16(event, 3);
+}
+
 
 
 /* API_END */