diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraArtifact.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraArtifact.kt
index 6ff3572e..9dffb40a 100644
--- a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraArtifact.kt
+++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraArtifact.kt
@@ -4,6 +4,7 @@ import androidx.room3.Entity
 import androidx.room3.PrimaryKey
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder
+import press.mantra.compose.database.model.traits.OptionalNostrEventEntity
 import press.mantra.compose.database.model.traits.TimestampedEntity
 import press.mantra.compose.nostr.nip30303.ArtifactEvent
 import press.mantra.compose.nostr.nip30303.tags.DialectIdTag
@@ -25,11 +26,21 @@ data class MantraArtifact(
     val license: String,
 //    val artifactApprovalId: String,
 
+    /**
+     * Signature will be an empty string if this is a rumor
+     */
     val signature: String,
 
+    val relayHint: String? = null,
+
+    val marmotGroupEventId: HexKey? = null,
+    /**
+     * Related nostrEventId if this is not a rumor...
+      */
+    override val nostrEventId: HexKey? = null,
     override val createdAt: Instant = Clock.System.now(),
     override val updatedAt: Instant = createdAt
-): TimestampedEntity {
+): OptionalNostrEventEntity, TimestampedEntity {
     fun toArtifactEvent(): ArtifactEvent {
         return ArtifactEvent(
             id = id,
diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraArtifactVersion.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraArtifactVersion.kt
index dff98553..e3354ff8 100644
--- a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraArtifactVersion.kt
+++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraArtifactVersion.kt
@@ -4,6 +4,7 @@ import androidx.room3.Entity
 import androidx.room3.PrimaryKey
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder
+import press.mantra.compose.database.model.traits.OptionalNostrEventEntity
 import press.mantra.compose.database.model.traits.TimestampedEntity
 import press.mantra.compose.nostr.nip30303.ArtifactVersionEvent
 import press.mantra.compose.nostr.nip30303.tags.ArtifactIdTag
@@ -25,11 +26,22 @@ data class MantraArtifactVersion(
      */
     val versionLabel: String,
 
+    /**
+     * Signature will be an empty string if this is a rumor
+     */
     val signature: String,
 
+    val relayHint: String? = null,
+    val marmotGroupEventId: HexKey? = null,
+
+    /**
+     * Related nostrEventId if this is not a rumor...
+     */
+    override val nostrEventId: HexKey? = null,
+
     override val createdAt: Instant = Clock.System.now(),
     override val updatedAt: Instant = createdAt
-): TimestampedEntity {
+): OptionalNostrEventEntity, TimestampedEntity {
     fun toArtifactVersionEvent(): ArtifactVersionEvent {
         return ArtifactVersionEvent(
             id = id,
diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraChapter.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraChapter.kt
index 7c26e513..b37f6cab 100644
--- a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraChapter.kt
+++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraChapter.kt
@@ -4,6 +4,7 @@ import androidx.room3.Entity
 import androidx.room3.PrimaryKey
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder
+import press.mantra.compose.database.model.traits.OptionalNostrEventEntity
 import press.mantra.compose.database.model.traits.TimestampedEntity
 import press.mantra.compose.nostr.nip30303.ArtifactVersionEvent
 import press.mantra.compose.nostr.nip30303.ChapterEvent
@@ -26,11 +27,22 @@ data class MantraChapter(
     val wordCount: Int,
     val characterCount: Int,
 
+    /**
+     * Signature will be an empty string if this is a rumor
+     */
     val signature: String,
 
+    val relayHint: String? = null,
+    val marmotGroupEventId: HexKey? = null,
+
+    /**
+     * Related nostrEventId if this is not a rumor...
+     */
+    override val nostrEventId: HexKey? = null,
+
     override val createdAt: Instant = Clock.System.now(),
     override val updatedAt: Instant = createdAt
-): TimestampedEntity {
+): OptionalNostrEventEntity, TimestampedEntity {
 
     fun toChapterEvent(): ChapterEvent {
         return ChapterEvent(
diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraChunk.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraChunk.kt
index 8550d5d1..4e859f9c 100644
--- a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraChunk.kt
+++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraChunk.kt
@@ -4,6 +4,7 @@ import androidx.room3.Entity
 import androidx.room3.PrimaryKey
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder
+import press.mantra.compose.database.model.traits.OptionalNostrEventEntity
 import press.mantra.compose.database.model.traits.TimestampedEntity
 import press.mantra.compose.nostr.nip30303.ChunkEvent
 import press.mantra.compose.nostr.nip30303.tags.ChapterIdTag
@@ -24,11 +25,21 @@ data class MantraChunk(
     val wordCount: Int,
     val characterCount: Int,
 
+    /**
+     * Signature will be an empty string if this is a rumor
+     */
     val signature: String,
 
+    val relayHint: String? = null,
+    val marmotGroupEventId: HexKey? = null,
+
+    /**
+     * Related nostrEventId if this is not a rumor...
+     */
+    override val nostrEventId: HexKey? = null,
     override val createdAt: Instant = Clock.System.now(),
     override val updatedAt: Instant = createdAt
-): TimestampedEntity {
+): OptionalNostrEventEntity, TimestampedEntity {
 
     fun toChunkEvent(): ChunkEvent {
         return ChunkEvent(
diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraDialect.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraDialect.kt
index 84f44186..f591dec6 100644
--- a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraDialect.kt
+++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraDialect.kt
@@ -3,6 +3,7 @@ package press.mantra.compose.database.model
 import androidx.room3.Entity
 import androidx.room3.PrimaryKey
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
+import press.mantra.compose.database.model.traits.OptionalNostrEventEntity
 import press.mantra.compose.database.model.traits.TimestampedEntity
 import press.mantra.compose.nostr.nip30303.DialectEvent
 import kotlin.time.Clock
@@ -22,9 +23,16 @@ data class MantraDialect(
 
     val signature: String,
 
+    val relayHint: String? = null,
+    val marmotGroupEventId: HexKey? = null,
+
+    /**
+     * Related nostrEventId if this is not a rumor...
+     */
+    override val nostrEventId: HexKey? = null,
     override val createdAt: Instant = Clock.System.now(),
     override val updatedAt: Instant = createdAt
-): TimestampedEntity {
+): OptionalNostrEventEntity, TimestampedEntity {
 
     fun toDialectEvent(): DialectEvent {
         return DialectEvent(
diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslation.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslation.kt
index 72879883..74b7af66 100644
--- a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslation.kt
+++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslation.kt
@@ -4,6 +4,7 @@ import androidx.room3.Entity
 import androidx.room3.PrimaryKey
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder
+import press.mantra.compose.database.model.traits.OptionalNostrEventEntity
 import press.mantra.compose.database.model.traits.TimestampedEntity
 import press.mantra.compose.nostr.nip30303.TranslationEvent
 import press.mantra.compose.nostr.nip30303.tags.TranslationArtifactVersionIdTag
@@ -25,9 +26,16 @@ data class MantraTranslation(
 
     val signature: String,
 
+    val relayHint: String? = null,
+    val marmotGroupEventId: HexKey? = null,
+
+    /**
+     * Related nostrEventId if this is not a rumor...
+     */
+    override val nostrEventId: HexKey? = null,
     override val createdAt: Instant = Clock.System.now(),
     override val updatedAt: Instant = createdAt
-): TimestampedEntity {
+): OptionalNostrEventEntity, TimestampedEntity {
 
     fun toTranslationEvent(): TranslationEvent {
         return TranslationEvent(
diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationArtifactVersion.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationArtifactVersion.kt
index fc1e2daf..7c7103cd 100644
--- a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationArtifactVersion.kt
+++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationArtifactVersion.kt
@@ -4,6 +4,7 @@ import androidx.room3.Entity
 import androidx.room3.PrimaryKey
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder
+import press.mantra.compose.database.model.traits.OptionalNostrEventEntity
 import press.mantra.compose.database.model.traits.TimestampedEntity
 import press.mantra.compose.nostr.nip30303.ArtifactVersionEvent
 import press.mantra.compose.nostr.nip30303.TranslationArtifactVersionEvent
@@ -25,11 +26,21 @@ data class MantraTranslationArtifactVersion(
     val name: String,
     val visibility: String,
 
+    /**
+     * Signature will be an empty string if this is a rumor
+     */
     val signature: String,
 
+    val relayHint: String? = null,
+    val marmotGroupEventId: HexKey? = null,
+
+    /**
+     * Related nostrEventId if this is not a rumor...
+     */
+    override val nostrEventId: HexKey? = null,
     override val createdAt: Instant = Clock.System.now(),
     override val updatedAt: Instant = createdAt
-): TimestampedEntity {
+): OptionalNostrEventEntity, TimestampedEntity {
 
     fun toTranslationArtifactVersionEvent(): TranslationArtifactVersionEvent {
         return TranslationArtifactVersionEvent(
diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationArtifactVersionEditor.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationArtifactVersionEditor.kt
index 4fa2c08e..639f8299 100644
--- a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationArtifactVersionEditor.kt
+++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationArtifactVersionEditor.kt
@@ -6,6 +6,7 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder
 import com.vitorpamplona.quartz.nipF4Podcasts.metadata.tags.AuthorTag
 import com.vitorpamplona.quartz.utils.TimeUtils
+import press.mantra.compose.database.model.traits.OptionalNostrEventEntity
 import press.mantra.compose.database.model.traits.TimestampedEntity
 import press.mantra.compose.nostr.nip30303.TranslationArtifactVersionEditorListEvent
 import press.mantra.compose.nostr.nip30303.TranslationChapterProofReaderListEvent
@@ -24,11 +25,21 @@ data class MantraTranslationArtifactVersionEditor(
     val translationArtifactVersionId: HexKey,
     val editorPublicKey: HexKey,
 
+    /**
+     * Signature will be an empty string if this is a rumor
+     */
     val signature: String,
 
+    val relayHint: String? = null,
+    val marmotGroupEventId: HexKey? = null,
+
+    /**
+     * Related nostrEventId if this is not a rumor...
+     */
+    override val nostrEventId: HexKey? = null,
     override val createdAt: Instant = Clock.System.now(),
     override val updatedAt: Instant = createdAt
-): TimestampedEntity {
+): OptionalNostrEventEntity, TimestampedEntity {
 
     companion object {
         fun toTranslationChapterProofReaderListEvent(mantraTranslationChapterProofReaders: List<MantraTranslationChapterProofReader>): TranslationArtifactVersionEditorListEvent {
diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationChapter.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationChapter.kt
index 5bbc7acd..c9f8b74e 100644
--- a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationChapter.kt
+++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationChapter.kt
@@ -3,6 +3,7 @@ package press.mantra.compose.database.model
 import androidx.room3.Entity
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder
+import press.mantra.compose.database.model.traits.OptionalNostrEventEntity
 import press.mantra.compose.database.model.traits.TimestampedEntity
 import press.mantra.compose.nostr.nip30303.TranslationChapterEvent
 import press.mantra.compose.nostr.nip30303.tags.ChapterIdTag
@@ -21,11 +22,21 @@ data class MantraTranslationChapter(
     val translationArtifactVersionId: HexKey,
     val index: Int,
 
+    /**
+     * Signature will be an empty string if this is a rumor
+     */
     val signature: String,
 
+    val relayHint: String? = null,
+    val marmotGroupEventId: HexKey? = null,
+
+    /**
+     * Related nostrEventId if this is not a rumor...
+     */
+    override val nostrEventId: HexKey? = null,
     override val createdAt: Instant = Clock.System.now(),
     override val updatedAt: Instant = createdAt
-): TimestampedEntity {
+): OptionalNostrEventEntity, TimestampedEntity {
     fun toTranslationChapterEvent(): TranslationChapterEvent {
         return TranslationChapterEvent(
             id = id,
diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationChapterProofReader.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationChapterProofReader.kt
index fc146a10..5264f3cd 100644
--- a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationChapterProofReader.kt
+++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationChapterProofReader.kt
@@ -6,6 +6,7 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder
 import com.vitorpamplona.quartz.nipF4Podcasts.metadata.tags.AuthorTag
 import com.vitorpamplona.quartz.utils.TimeUtils
+import press.mantra.compose.database.model.traits.OptionalNostrEventEntity
 import press.mantra.compose.database.model.traits.TimestampedEntity
 import press.mantra.compose.nostr.nip30303.TranslationChapterProofReaderListEvent
 import press.mantra.compose.nostr.nip30303.tags.TranslationChapterIdTag
@@ -23,11 +24,21 @@ data class MantraTranslationChapterProofReader(
     val translationChapterId: HexKey,
     val proofReaderPublicKey: HexKey,
 
+    /**
+     * Signature will be an empty string if this is a rumor
+     */
     val signature: String,
 
+    val relayHint: String? = null,
+    val marmotGroupEventId: HexKey? = null,
+
+    /**
+     * Related nostrEventId if this is not a rumor...
+     */
+    override val nostrEventId: HexKey? = null,
     override val createdAt: Instant = Clock.System.now(),
     override val updatedAt: Instant = createdAt
-): TimestampedEntity {
+): OptionalNostrEventEntity, TimestampedEntity {
 
     companion object {
         fun toTranslationChapterProofReaderListEvent(mantraTranslationChapterProofReaders: List<MantraTranslationChapterProofReader>): TranslationChapterProofReaderListEvent {
diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationChapterTranslator.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationChapterTranslator.kt
index 4f9e6d04..996fefba 100644
--- a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationChapterTranslator.kt
+++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationChapterTranslator.kt
@@ -6,6 +6,7 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder
 import com.vitorpamplona.quartz.nipF4Podcasts.metadata.tags.AuthorTag
 import com.vitorpamplona.quartz.utils.TimeUtils
+import press.mantra.compose.database.model.traits.OptionalNostrEventEntity
 import press.mantra.compose.database.model.traits.TimestampedEntity
 import press.mantra.compose.nostr.nip30303.TranslationChapterTranslatorListEvent
 import press.mantra.compose.nostr.nip30303.tags.TranslationChapterIdTag
@@ -23,11 +24,21 @@ data class MantraTranslationChapterTranslator(
     val translationChapterId: HexKey,
     val translatorPublicKey: HexKey,
 
+    /**
+     * Signature will be an empty string if this is a rumor
+     */
     val signature: String,
 
+    val relayHint: String? = null,
+    val marmotGroupEventId: HexKey? = null,
+
+    /**
+     * Related nostrEventId if this is not a rumor...
+     */
+    override val nostrEventId: HexKey? = null,
     override val createdAt: Instant = Clock.System.now(),
     override val updatedAt: Instant = createdAt
-): TimestampedEntity {
+): OptionalNostrEventEntity, TimestampedEntity {
 
     companion object {
         fun toTranslationChapterTranslatorListEvent(mantraTranslationChapterTranslators: List<MantraTranslationChapterTranslator>): TranslationChapterTranslatorListEvent {
diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationChunk.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationChunk.kt
index 211f380b..3a0a3d78 100644
--- a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationChunk.kt
+++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationChunk.kt
@@ -4,6 +4,7 @@ import androidx.room3.Entity
 import androidx.room3.PrimaryKey
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder
+import press.mantra.compose.database.model.traits.OptionalNostrEventEntity
 import press.mantra.compose.database.model.traits.TimestampedEntity
 import press.mantra.compose.nostr.nip30303.TranslationChunkEvent
 import press.mantra.compose.nostr.nip30303.tags.ChunkIdTag
@@ -24,11 +25,21 @@ data class MantraTranslationChunk(
     val text: String,
     val index: Int,
 
+    /**
+     * Signature will be an empty string if this is a rumor
+     */
     val signature: String,
 
+    val relayHint: String? = null,
+    val marmotGroupEventId: HexKey? = null,
+
+    /**
+     * Related nostrEventId if this is not a rumor...
+     */
+    override val nostrEventId: HexKey? = null,
     override val createdAt: Instant = Clock.System.now(),
     override val updatedAt: Instant = createdAt
-): TimestampedEntity {
+): OptionalNostrEventEntity, TimestampedEntity {
 
     fun toTranslationChunkEvent(): TranslationChunkEvent {
         return TranslationChunkEvent(
diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationTranslator.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationTranslator.kt
index 1a716fa2..69c3218d 100644
--- a/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationTranslator.kt
+++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/database/model/MantraTranslationTranslator.kt
@@ -6,6 +6,7 @@ import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder
 import com.vitorpamplona.quartz.nipF4Podcasts.metadata.tags.AuthorTag
 import com.vitorpamplona.quartz.utils.TimeUtils
+import press.mantra.compose.database.model.traits.OptionalNostrEventEntity
 import press.mantra.compose.database.model.traits.TimestampedEntity
 import press.mantra.compose.nostr.nip30303.TranslationTranslatorListEvent
 import press.mantra.compose.nostr.nip30303.tags.TranslationIdTag
@@ -23,11 +24,21 @@ data class MantraTranslationTranslator(
     val translationId: HexKey,
     val translatorPublicKey: HexKey,
 
+    /**
+     * Signature will be an empty string if this is a rumor
+     */
     val signature: String,
 
+    val relayHint: String? = null,
+    val marmotGroupEventId: HexKey? = null,
+
+    /**
+     * Related nostrEventId if this is not a rumor...
+     */
+    override val nostrEventId: HexKey? = null,
     override val createdAt: Instant = Clock.System.now(),
     override val updatedAt: Instant = createdAt
-): TimestampedEntity {
+): OptionalNostrEventEntity, TimestampedEntity {
 
     companion object {
         fun toTranslationChapterProofReaderListEvent(mantraTranslationChapterProofReaders: List<MantraTranslationChapterProofReader>): TranslationTranslatorListEvent {
diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/ArtifactIdTag.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/ArtifactIdTag.kt
index 487eefb9..cf8502ab 100644
--- a/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/ArtifactIdTag.kt
+++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/ArtifactIdTag.kt
@@ -30,8 +30,8 @@ data class ArtifactIdTag(
 
         fun assemble(
             eventId: HexKey,
-            relay: NormalizedRelayUrl?,
-            pubkey: String?,
+            relay: NormalizedRelayUrl? = null,
+            pubkey: String? = null,
         ) = arrayOfNotNull(TAG_NAME, eventId, relay?.url, pubkey)
 
         fun assemble(ref: EventReference) = assemble(ref.eventId, ref.relayHint, ref.author)
diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/ArtifactVersionIdTag.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/ArtifactVersionIdTag.kt
index fa2f9318..d6f35eea 100644
--- a/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/ArtifactVersionIdTag.kt
+++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/ArtifactVersionIdTag.kt
@@ -30,8 +30,8 @@ class ArtifactVersionIdTag(
 
         fun assemble(
             eventId: HexKey,
-            relay: NormalizedRelayUrl?,
-            pubkey: String?,
+            relay: NormalizedRelayUrl? = null,
+            pubkey: String? = null,
         ) = arrayOfNotNull(TAG_NAME, eventId, relay?.url, pubkey)
 
         fun assemble(ref: EventReference) = assemble(ref.eventId, ref.relayHint, ref.author)
diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/ChapterIdTag.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/ChapterIdTag.kt
index 45255e3a..9fdb1445 100644
--- a/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/ChapterIdTag.kt
+++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/ChapterIdTag.kt
@@ -30,8 +30,8 @@ class ChapterIdTag(
 
         fun assemble(
             eventId: HexKey,
-            relay: NormalizedRelayUrl?,
-            pubkey: String?,
+            relay: NormalizedRelayUrl? = null,
+            pubkey: String? = null,
         ) = arrayOfNotNull(TAG_NAME, eventId, relay?.url, pubkey)
 
         fun assemble(ref: EventReference) = assemble(ref.eventId, ref.relayHint, ref.author)
diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/ChunkIdTag.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/ChunkIdTag.kt
index 7a874dd3..1935990d 100644
--- a/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/ChunkIdTag.kt
+++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/ChunkIdTag.kt
@@ -30,8 +30,8 @@ class ChunkIdTag(
 
         fun assemble(
             eventId: HexKey,
-            relay: NormalizedRelayUrl?,
-            pubkey: String?,
+            relay: NormalizedRelayUrl? = null,
+            pubkey: String? = null,
         ) = arrayOfNotNull(TAG_NAME, eventId, relay?.url, pubkey)
 
         fun assemble(ref: EventReference) = assemble(ref.eventId, ref.relayHint, ref.author)
diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/DialectIdTag.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/DialectIdTag.kt
index b05890a2..1a374182 100644
--- a/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/DialectIdTag.kt
+++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/DialectIdTag.kt
@@ -30,8 +30,8 @@ class DialectIdTag(
 
         fun assemble(
             eventId: HexKey,
-            relay: NormalizedRelayUrl?,
-            pubkey: String?,
+            relay: NormalizedRelayUrl? = null,
+            pubkey: String? = null,
         ) = arrayOfNotNull(TAG_NAME, eventId, relay?.url, pubkey)
 
         fun assemble(ref: EventReference) = assemble(ref.eventId, ref.relayHint, ref.author)
diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/TranslationArtifactVersionIdTag.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/TranslationArtifactVersionIdTag.kt
index a9ef8fae..a451426f 100644
--- a/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/TranslationArtifactVersionIdTag.kt
+++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/TranslationArtifactVersionIdTag.kt
@@ -30,8 +30,8 @@ class TranslationArtifactVersionIdTag(
 
         fun assemble(
             eventId: HexKey,
-            relay: NormalizedRelayUrl?,
-            pubkey: String?,
+            relay: NormalizedRelayUrl? = null,
+            pubkey: String? = null,
         ) = arrayOfNotNull(TAG_NAME, eventId, relay?.url, pubkey)
 
         fun assemble(ref: EventReference) = assemble(ref.eventId, ref.relayHint, ref.author)
diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/TranslationChapterIdTag.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/TranslationChapterIdTag.kt
index b616fb88..9bc6a140 100644
--- a/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/TranslationChapterIdTag.kt
+++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/TranslationChapterIdTag.kt
@@ -30,8 +30,8 @@ class TranslationChapterIdTag(
 
         fun assemble(
             eventId: HexKey,
-            relay: NormalizedRelayUrl?,
-            pubkey: String?,
+            relay: NormalizedRelayUrl? = null,
+            pubkey: String? = null,
         ) = arrayOfNotNull(TAG_NAME, eventId, relay?.url, pubkey)
 
         fun assemble(ref: EventReference) = assemble(ref.eventId, ref.relayHint, ref.author)
diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/TranslationChunkIdTag.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/TranslationChunkIdTag.kt
index b1cecc47..11d34ddd 100644
--- a/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/TranslationChunkIdTag.kt
+++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/TranslationChunkIdTag.kt
@@ -30,8 +30,8 @@ class TranslationChunkIdTag(
 
         fun assemble(
             eventId: HexKey,
-            relay: NormalizedRelayUrl?,
-            pubkey: String?,
+            relay: NormalizedRelayUrl? = null,
+            pubkey: String? = null,
         ) = arrayOfNotNull(TAG_NAME, eventId, relay?.url, pubkey)
 
         fun assemble(ref: EventReference) = assemble(ref.eventId, ref.relayHint, ref.author)
diff --git a/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/TranslationIdTag.kt b/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/TranslationIdTag.kt
index 8c7c077c..ee526bca 100644
--- a/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/TranslationIdTag.kt
+++ b/composeApp/src/commonMain/kotlin/press/mantra/compose/nostr/nip30303/tags/TranslationIdTag.kt
@@ -30,8 +30,8 @@ class TranslationIdTag(
 
         fun assemble(
             eventId: HexKey,
-            relay: NormalizedRelayUrl?,
-            pubkey: String?,
+            relay: NormalizedRelayUrl? = null,
+            pubkey: String? = null,
         ) = arrayOfNotNull(TAG_NAME, eventId, relay?.url, pubkey)
 
         fun assemble(ref: EventReference) = assemble(ref.eventId, ref.relayHint, ref.author)