diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/MetadataRegister.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/MetadataRegister.kt
index 7e6913427..7eb021019 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/MetadataRegister.kt
+++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/descriptors/MetadataRegister.kt
@@ -10,6 +10,7 @@ package com.facebook.flipper.plugins.uidebugger.descriptors
 import com.facebook.flipper.plugins.uidebugger.model.InspectableValue
 import com.facebook.flipper.plugins.uidebugger.model.Metadata
 import com.facebook.flipper.plugins.uidebugger.model.MetadataId
+import kotlinx.serialization.json.JsonPrimitive
 
 /**
  * Registry of attribute metadata. There's two types of attributes:
@@ -34,7 +35,8 @@ object MetadataRegister {
       namespace: String,
       name: String,
       mutable: Boolean = false,
-      possibleValues: Set<InspectableValue>? = emptySet()
+      possibleValues: Set<InspectableValue>? = null,
+      customAttributes: Map<String, JsonPrimitive>? = null
   ): MetadataId {
     val key = key(namespace, name)
     register[key]?.let { m ->
@@ -43,7 +45,8 @@ object MetadataRegister {
 
     synchronized(lock) {
       val identifier = ++generator
-      val metadata = Metadata(identifier, type, namespace, name, mutable, possibleValues)
+      val metadata =
+          Metadata(identifier, type, namespace, name, mutable, possibleValues, customAttributes)
 
       register[key] = metadata
       pendingKeys.add(key)
diff --git a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/model/Metadata.kt b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/model/Metadata.kt
index b77db7c26..0ad0915b7 100644
--- a/android/src/main/java/com/facebook/flipper/plugins/uidebugger/model/Metadata.kt
+++ b/android/src/main/java/com/facebook/flipper/plugins/uidebugger/model/Metadata.kt
@@ -7,6 +7,8 @@
 
 package com.facebook.flipper.plugins.uidebugger.model
 
+import kotlinx.serialization.json.JsonPrimitive
+
 typealias MetadataId = Int
 
 /**
@@ -22,5 +24,5 @@ data class Metadata(
     val name: String,
     val mutable: kotlin.Boolean,
     val possibleValues: Set<InspectableValue>? = emptySet(),
-    val tags: List<String>? = emptyList()
-) {}
+    val customAttributes: Map<String, JsonPrimitive>? = null
+)