diff --git a/features/template/build.gradle.kts b/features/template/build.gradle.kts
index 6550ff8e56..636835c609 100644
--- a/features/template/build.gradle.kts
+++ b/features/template/build.gradle.kts
@@ -23,6 +23,7 @@ plugins {
 }
 
 android {
+    // TODO change the namespace (and your classes package)
     namespace = "io.element.android.x.features.template"
 }
 
diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateEvents.kt b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateEvents.kt
index 177cb1584a..588bbd957d 100644
--- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateEvents.kt
+++ b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateEvents.kt
@@ -16,6 +16,7 @@
 
 package io.element.android.x.features.template
 
+// TODO Add your events or remove the file completely if no events
 sealed interface TemplateEvents {
     object MyEvent: TemplateEvents
 }
diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt
index e82dff2dcc..7c5c4e78de 100644
--- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt
+++ b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateNode.kt
@@ -29,7 +29,7 @@ import io.element.android.x.anvilannotations.ContributesNode
 import io.element.android.x.architecture.presenterConnector
 import io.element.android.x.di.AppScope
 
-// Change to use the right Scope for your feature.
+// TODO Change to use the right Scope for your feature. For now it can be AppScope, SessionScope or RoomScope
 @ContributesNode(AppScope::class)
 class TemplateNode @AssistedInject constructor(
     @Assisted buildContext: BuildContext,
diff --git a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateState.kt b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateState.kt
index cd05023a31..8f633ae8c2 100644
--- a/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateState.kt
+++ b/features/template/src/main/kotlin/io/element/android/x/features/template/TemplateState.kt
@@ -16,6 +16,7 @@
 
 package io.element.android.x.features.template
 
+// TODO add your ui models. Remove the eventSink if you don't have events.
 data class TemplateState(
     val eventSink: (TemplateEvents) -> Unit = {}
 )