diff --git a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/IViewContext.kt b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/IViewContext.kt
index 928f591..7fd9eec 100644
--- a/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/IViewContext.kt
+++ b/core/src/main/kotlin/de/tschuehly/spring/viewcomponent/core/IViewContext.kt
@@ -4,6 +4,8 @@ interface IViewContext {
     companion object {
         var componentBean: Any? = null
         var componentTemplate: String? = null
+        var jteTemplateEngine: Any? = null
+        var templateSuffx: String = ""
         fun getAttributes(context: IViewContext): Map<String, Any> {
             return context::class.java.declaredFields.map { field ->
                 context::class.java.getDeclaredField(field.name).let {
@@ -12,7 +14,11 @@ interface IViewContext {
                 }
             }.toMap()
         }
-    }
-}
 
-class EmptyViewContext() : IViewContext
\ No newline at end of file
+        fun getTemplate(context: IViewContext): String {
+            val componentName = context.javaClass.enclosingClass.simpleName.substringBefore("$$")
+            val componentPackage = context.javaClass.enclosingClass.`package`.name.replace(".", "/") + "/"
+            return "$componentPackage$componentName$templateSuffx"
+        }
+    }
+}
\ No newline at end of file
diff --git a/examples/jte-example/build.gradle.kts b/examples/jte-example/build.gradle.kts
index 48f2fc0..52599fa 100644
--- a/examples/jte-example/build.gradle.kts
+++ b/examples/jte-example/build.gradle.kts
@@ -7,25 +7,18 @@ plugins {
     kotlin("jvm") version "1.8.21"
     kotlin("plugin.spring") version "1.8.21"
     kotlin("kapt") version "1.8.21"
-    id("gg.jte.gradle") version("3.0.2")
+  //  id("gg.jte.gradle") version("3.0.2")
 }
 
 group = "de.tschuehly"
 version = "0.0.1-SNAPSHOT"
 java.sourceCompatibility = JavaVersion.VERSION_17
 
-jte{
-    generate()
-}
 repositories {
     mavenCentral()
     maven("https://jitpack.io")
 }
 
-//jte {
-//    sourceDirectory.set(Path.of("src/main/kotlin"))
-//    generate()
-//}
 dependencies {
 //    implementation("de.tschuehly:spring-view-component-jte:0.6.0")
     implementation("de.tschuehly:spring-view-component-jte:0.6.2-SNAPSHOT")
@@ -54,17 +47,10 @@ tasks.withType<KotlinCompile> {
 tasks.withType<Test> {
     useJUnitPlatform()
 }
-//sourceSets {
-//    main {
-//        resources {
-//            srcDir("src/main/kotlin")
-//            exclude("**/*.kt")
-//        }
-//    }
-//    test {
-//        resources {
-//            srcDir("src/test/kotlin")
-//            exclude("**/*.kt")
-//        }
-//    }
-//}
+sourceSets{
+    main{
+        java{
+            srcDir("build/generated-sources/jte")
+        }
+    }
+}
diff --git a/examples/jte-example/src/main/jte/TestViewComponent.jte b/examples/jte-example/src/main/jte/TestViewComponent.jte
deleted file mode 100644
index 9b34ab1..0000000
--- a/examples/jte-example/src/main/jte/TestViewComponent.jte
+++ /dev/null
@@ -1,50 +0,0 @@
-@param de.tschuehly.jteviewcomponentdemo.web.action.ActionViewComponent.Person person
-@param java.util.HashMap<Integer,String> itemList
-@param Integer counter
-
-<div>
-<script defer src="/webjars/htmx.org/dist/htmx.min.js"></script>
-<h2>ViewAction Get CountUp</h2>
-
-<button view:action="countUp">Default ViewAction [GET]</button>
-<h3>${counter}</h3>
-
-
-<h2>ViewAction Post AddItem</h2>
-<form view:action="addItem">
-    <input type="text" name="item">
-    <button type="submit">Save Item</button>
-</form>
-<table>
-    <tr>
-        <th>Item</th>
-        <th>Action</th>
-    </tr>
-    @for(var item: itemList.entrySet())
-        <tr>
-            <td>
-                <span>${item.getValue()}</span>
-            </td>
-            <td>
-                <button view:action="deleteItem?id=${item.getKey()}">Delete Item ${item.getKey()}</button>
-            </td>
-        </tr>
-    @endfor
-</table>
-
-<h2>ViewAction Put/Patch Person Form</h2>
-
-<form style="display: inline-grid; gap: 0.5rem">
-    <label>
-        Name <input type="text" name="name" value="${person.getName()}">
-    </label>
-    <label>
-        Age: <input type="number" name="age" value="${person.getAge()}">
-    </label>
-    <label>
-        Location: <input type="text" name="location" value="${person.getLocation()}">
-    </label>
-    <button type="submit" view:action="savePersonPut">Save Changes using Put</button>
-    <button type="submit" view:action="savePersonPatch">Save Changes using Patch</button>
-</form>
-</div>
\ No newline at end of file
diff --git a/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/action/ActionViewComponent.jte b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/action/ActionViewComponent.jte
index 1c0fef4..0c8109f 100644
--- a/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/action/ActionViewComponent.jte
+++ b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/action/ActionViewComponent.jte
@@ -1,15 +1,17 @@
 @param de.tschuehly.jteviewcomponentdemo.web.action.ActionViewComponent.Person person
 @param java.util.HashMap<Integer,String> itemList
 @param Integer counter
-
-<div>TEST12
-<script defer src="/webjars/htmx.org/dist/htmx.min.js"></script>
+<html>
+<head>
+    <script src="http://localhost:35729/livereload.js"></script>
+    <script defer src="/webjars/htmx.org/dist/htmx.min.js"></script>
+</head>
+<body>
 <h2>ViewAction Get CountUp</h2>
 
 <button view:action="countUp">Default ViewAction [GET]</button>
 <h3>${counter}</h3>
 
-
 <h2>ViewAction Post AddItem</h2>
 <form view:action="addItem">
     <input type="text" name="item">
@@ -36,15 +38,16 @@
 
 <form style="display: inline-grid; gap: 0.5rem">
     <label>
-        Name <input type="text" name="name" value="${person.getName()}">
+        Name <input type="text" id="name" name="name" value="${person.getName()}">
     </label>
     <label>
-        Age: <input type="number" name="age" value="${person.getAge()}">
+        Age: <input type="number" id="age" name="age" value="${person.getAge()}">
     </label>
     <label>
-        Location: <input type="text" name="location" value="${person.getLocation()}">
+        Location: <input type="text" id="location" name="location" value="${person.getLocation()}">
     </label>
     <button type="submit" view:action="savePersonPut">Save Changes using Put</button>
     <button type="submit" view:action="savePersonPatch">Save Changes using Patch</button>
 </form>
-</div>
\ No newline at end of file
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/action/ActionViewComponent.kt b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/action/ActionViewComponent.kt
index 09cb8ba..5805ca6 100644
--- a/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/action/ActionViewComponent.kt
+++ b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/action/ActionViewComponent.kt
@@ -4,12 +4,13 @@ import de.tschuehly.jteviewcomponentdemo.core.ExampleService
 import de.tschuehly.spring.viewcomponent.core.IViewContext
 import de.tschuehly.spring.viewcomponent.core.action.*
 import de.tschuehly.spring.viewcomponent.core.component.ViewComponent
+import de.tschuehly.spring.viewcomponent.jte.ViewContext
 
 @ViewComponent
 class ActionViewComponent(
     val exampleService: ExampleService
 ) {
-    data class ActionView(val itemList: MutableMap<Int, String>, val counter: Int, val person: Person) : IViewContext
+    data class ActionView(val itemList: MutableMap<Int, String>, val counter: Int, val person: Person) : ViewContext
 
     fun render() = ActionView(exampleService.itemList, counter, person)
 
diff --git a/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.jte b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.jte
index 97cc7d4..3e63541 100644
--- a/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.jte
+++ b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.jte
@@ -1,10 +1,12 @@
+<html>
 <div>
-    <div>
-        <h1>This is the IndexViewComponent</h1>
-    </div>
-    <a href="/">IndexViewComponent</a><br>
-    <a href="/simple">SimpleViewComponent</a><br>
-    <a href="/layout">LayoutViewComponent</a><br>
-    <a href="/action">ActionViewComponent</a><br>
-    <a href="/nested-action">NestedActionViewComponent</a>
-</div>
\ No newline at end of file
+    <h1>This is the IndexViewComponent</h1>
+
+</div>
+<a href="/">IndexViewComponent</a><br>
+<a href="/simple">SimpleViewComponent</a><br>
+<a href="/layout">LayoutViewComponent</a><br>
+<a href="/action">ActionViewComponent</a><br>
+<a href="/nested-action">NestedActionViewComponent</a><br>
+
+</html>
\ No newline at end of file
diff --git a/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.kt b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.kt
index eaffc5d..715f8f2 100644
--- a/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.kt
+++ b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/index/IndexViewComponent.kt
@@ -1,8 +1,9 @@
 package de.tschuehly.jteviewcomponentdemo.web.index
 
 import de.tschuehly.spring.viewcomponent.core.component.ViewComponent
+import de.tschuehly.spring.viewcomponent.jte.EmptyViewContext
 
 @ViewComponent
 class IndexViewComponent {
-    fun render() = de.tschuehly.spring.viewcomponent.core.EmptyViewContext()
+    fun render() = EmptyViewContext()
 }
\ No newline at end of file
diff --git a/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/layout/LayoutViewComponent.jte b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/layout/LayoutViewComponent.jte
index d30b716..8390bc8 100644
--- a/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/layout/LayoutViewComponent.jte
+++ b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/layout/LayoutViewComponent.jte
@@ -1,5 +1,4 @@
-@import de.tschuehly.spring.viewcomponent.jte.ViewContext
-@param ViewContext nestedViewComponent
+@param de.tschuehly.spring.viewcomponent.jte.ViewContext nestedViewComponent
 <html>
 
 <nav>
diff --git a/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/layout/LayoutViewComponent.kt b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/layout/LayoutViewComponent.kt
index ecc1ab6..509f311 100644
--- a/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/layout/LayoutViewComponent.kt
+++ b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/layout/LayoutViewComponent.kt
@@ -2,11 +2,12 @@ package de.tschuehly.jteviewcomponentdemo.web.layout
 
 import de.tschuehly.spring.viewcomponent.core.IViewContext
 import de.tschuehly.spring.viewcomponent.core.component.ViewComponent
+import de.tschuehly.spring.viewcomponent.jte.ViewContext
 
 @ViewComponent
 class LayoutViewComponent {
-    data class LayoutView(val nestedViewComponent: IViewContext) : IViewContext
+    data class LayoutView(val nestedViewComponent: ViewContext) : ViewContext
 
-    fun render(nestedViewComponent: IViewContext) = LayoutView(nestedViewComponent)
+    fun render(nestedViewComponent: ViewContext) = LayoutView(nestedViewComponent)
 
 }
\ No newline at end of file
diff --git a/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/simple/SimpleViewComponent.kt b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/simple/SimpleViewComponent.kt
index 1a535a9..952dfee 100644
--- a/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/simple/SimpleViewComponent.kt
+++ b/examples/jte-example/src/main/kotlin/de/tschuehly/jteviewcomponentdemo/web/simple/SimpleViewComponent.kt
@@ -4,18 +4,15 @@ import de.tschuehly.jteviewcomponentdemo.core.ExampleService
 import de.tschuehly.spring.viewcomponent.core.IViewContext
 import de.tschuehly.spring.viewcomponent.core.action.PostViewAction
 import de.tschuehly.spring.viewcomponent.core.component.ViewComponent
-import de.tschuehly.spring.viewcomponent.core.toProperty
 import de.tschuehly.spring.viewcomponent.jte.ViewContext
 
 @ViewComponent
 class SimpleViewComponent(
     val exampleService: ExampleService
 ) {
-    fun render(): IViewContext {
-        return HelloWorldView(exampleService.getHelloWorld())
-    }
+    fun render() = HelloWorldView(exampleService.getHelloWorld())
 
-    data class HelloWorldView(val helloWorld: String) : IViewContext
+    data class HelloWorldView(val helloWorld: String) : ViewContext
 
     @PostViewAction
     fun testAction(): IViewContext {
diff --git a/examples/jte-example/src/test/kotlin/de/tschuehly/jteviewcomponentdemo/JteIntegrationTest.kt b/examples/jte-example/src/test/kotlin/de/tschuehly/jteviewcomponentdemo/JteIntegrationTest.kt
index 198a09f..ec157e8 100644
--- a/examples/jte-example/src/test/kotlin/de/tschuehly/jteviewcomponentdemo/JteIntegrationTest.kt
+++ b/examples/jte-example/src/test/kotlin/de/tschuehly/jteviewcomponentdemo/JteIntegrationTest.kt
@@ -2,6 +2,7 @@ package de.tschuehly.jteviewcomponentdemo
 
 
 import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
@@ -15,71 +16,169 @@ import org.springframework.http.ResponseEntity
 @SpringBootTest(
     webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT
 )
-@Disabled
 class JteIntegrationTest(
     @Autowired val testRestTemplate: TestRestTemplate
 ) {
     @Test
     fun testIndexComponent() {
         val expectedHtml =
-            """<html><div><h1>This is the IndexViewComponent</h1></div><a href="/">IndexViewComponent</a><br><a href="/simple">SimpleViewComponent</a><br><a href="/layout">LayoutViewComponent</a><br><a href="/action">ActionViewComponent</a><br><a href="/nested-action">NestedActionViewComponent</a><br></br></br></br></br></br></html>"""
+            //language=html
+            """
+                <html>
+                    <div>
+                        <h1>This is the IndexViewComponent</h1>
+                    </div>
+                    <a href="/">IndexViewComponent</a><br>
+                    <a href="/simple">SimpleViewComponent</a><br>
+                    <a href="/layout">LayoutViewComponent</a><br>
+                    <a href="/action">ActionViewComponent</a><br>
+                    <a href="/nested-action">NestedActionViewComponent</a><br>
+                </html>
+            """.trimIndent()
         assertEndpointReturns("/", expectedHtml)
+
     }
 
     @Test
     fun testSimpleComponent() {
-        val expectedHtml = """<div><h2>This is the SimpleViewComponent</h2><div>Hello World</div></div>"""
+        //language=html
+        val expectedHtml = """
+            <div>
+                <h2>This is the SimpleViewComponent</h2>
+                <div>Hello World</div>
+            </div>
+        """.trimIndent()
         assertEndpointReturns("/simple", expectedHtml)
     }
 
     @Test
     fun testActionComponent() {
+        val expectedHtml =
+            //language=html
+            """
+                <html>
+                <head>
+                    <script src="http://localhost:35729/livereload.js"></script>
+                    <script defer src="/webjars/htmx.org/dist/htmx.min.js"></script>
+                </head>
+                <body id="actionviewcomponent">
+                <h2>ViewAction Get CountUp</h2>
+                <button hx-get="/custompath/countup" hx-target="#actionviewcomponent">Default ViewAction [GET]</button>
+                <h3>0</h3>
+                <h2>ViewAction Post AddItem</h2>
+                <form hx-post="/actionviewcomponent/additem" hx-target="#actionviewcomponent">
+                    <input type="text" name="item">
+                    <button type="submit">Save Item</button>
+                </form>
+                <table>
+                    <tr>
+                        <th>Item</th>
+                        <th>Action</th>
+                    </tr>
+                </table>
+                <h2>ViewAction Put/Patch Person Form</h2>
+                <form style="display: inline-grid; gap: 0.5rem">
+                    <label>Name<input type="text" id="name" name="name" value="Thomas">
+                    </label>
+                    <label>Age: <input type="number" id="age" name="age" value="23">
+                    </label>
+                    <label>Location: <input type="text" id="location" name="location" value="Ludwigsburg">
+                    </label>
+                    <button type="submit" hx-put="/actionviewcomponent/savepersonput" hx-target="#actionviewcomponent">
+                        Save Changes using Put
+                    </button>
+                    <button type="submit" hx-patch="/actionviewcomponent/savepersonpatch" hx-target="#actionviewcomponent">
+                        Save Changes using Patch
+                    </button>
+                </form>
+                </body>
+                </html>
+            """.trimIndent()
         assertEndpointReturns(
             "/action",
-            """<div id="actionviewcomponent"><script defer="" src="/webjars/htmx.org/dist/htmx.min.js"></script><h2>ViewAction Get CountUp</h2><button hx-get="/custompath/countup" hx-target="#actionviewcomponent" hx-swap="outerHTML">Default ViewAction [GET]</button><h3>0</h3><h2>ViewAction Post AddItem</h2><form hx-post="/actionviewcomponent/additem" hx-target="#actionviewcomponent" hx-swap="outerHTML"><input type="text" name="item"><button type="submit">Save Item</button></input></form><table><tr><th>Item</th><th>Action</th></tr></table><h2>ViewAction Put/Patch Person Form</h2><form style="display: inline-grid; gap: 0.5rem"><label>Name<input type="text" id="name" name="name" value="Thomas"></input></label><label>Age: <input type="number" id="age" name="age" value="23"></input></label><label>Location: <input type="text" id="location" name="location" value="Ludwigsburg"></input></label><button type="submit" hx-put="/actionviewcomponent/savepersonput" hx-target="#actionviewcomponent" hx-swap="outerHTML">Save Changes using Put</button><button type="submit" hx-patch="/actionviewcomponent/savepersonpatch" hx-target="#actionviewcomponent" hx-swap="outerHTML">Save Changes using Patch</button></form></div>"""
+            expectedHtml
         )
     }
 
+
     @Test
     fun testNestedActionComponent() {
         val expectedHtml =
-            """<html><nav>This is a Navbar</nav><body><div id="actionviewcomponent" nestedviewcomponent=""><div><script defer="" src="/webjars/htmx.org/dist/htmx.min.js"></script><h2>ViewAction Get CountUp</h2><button hx-get="/custompath/countup" hx-target="#actionviewcomponent" hx-swap="outerHTML">Default ViewAction [GET]</button><h3>0</h3><h2>ViewAction Post AddItem</h2><form hx-post="/actionviewcomponent/additem" hx-target="#actionviewcomponent" hx-swap="outerHTML"><input type="text" name="item"><button type="submit">Save Item</button></input></form><table><tr><th>Item</th><th>Action</th></tr></table><h2>ViewAction Put/Patch Person Form</h2><form style="display: inline-grid; gap: 0.5rem"><label>Name<input type="text" id="name" name="name" value="Thomas"></input></label><label>Age: <input type="number" id="age" name="age" value="23"></input></label><label>Location: <input type="text" id="location" name="location" value="Ludwigsburg"></input></label><button type="submit" hx-put="/actionviewcomponent/savepersonput" hx-target="#actionviewcomponent" hx-swap="outerHTML">Save Changes using Put</button><button type="submit" hx-patch="/actionviewcomponent/savepersonpatch" hx-target="#actionviewcomponent" hx-swap="outerHTML">Save Changes using Patch</button></form></div></div></body><footer>This is a footer</footer></html>"""
+            //language=html
+            """
+                <html>
+                <nav>This is a Navbar</nav>
+                <body id="layoutviewcomponent">
+                <html>
+                <head>
+                    <script src="http://localhost:35729/livereload.js"></script>
+                    <script defer src="/webjars/htmx.org/dist/htmx.min.js"></script>
+                </head>
+                <body id="actionviewcomponent">
+                <h2>ViewAction Get CountUp</h2>
+                <button hx-get="/custompath/countup" hx-target="#actionviewcomponent">Default ViewAction [GET]</button>
+                <h3>0</h3>
+                <h2>ViewAction Post AddItem</h2>
+                <form hx-post="/actionviewcomponent/additem" hx-target="#actionviewcomponent">
+                    <input type="text" name="item">
+                    <button type="submit">Save Item</button>
+                </form>
+                <table>
+                    <tr>
+                        <th>Item</th>
+                        <th>Action</th>
+                    </tr>
+                </table>
+                <h2>ViewAction Put/Patch Person Form</h2>
+                <form style="display: inline-grid; gap: 0.5rem">
+                    <label>Name<input type="text" id="name" name="name" value="Thomas">
+                    </label>
+                    <label>Age: <input type="number" id="age" name="age" value="23">
+                    </label>
+                    <label>Location: <input type="text" id="location" name="location" value="Ludwigsburg">
+                    </label>
+                    <button type="submit" hx-put="/actionviewcomponent/savepersonput" hx-target="#actionviewcomponent">
+                        Save Changes using Put
+                    </button>
+                    <button type="submit" hx-patch="/actionviewcomponent/savepersonpatch" hx-target="#actionviewcomponent">
+                        Save Changes using Patch
+                    </button>
+                </form>
+                </body>
+                </html>
+                </body>
+                <footer>This is a footer</footer>
+                </html>
+            """.trimIndent()
         assertEndpointReturns("/nested-action", expectedHtml)
     }
 
     @Test
     fun testLayoutComponent() {
+        //language=html
         val expectedHtml =
-            """<html><nav>This is a Navbar</nav><body><div id="simpleviewcomponent" nestedviewcomponent=""><div><h2>This is the SimpleViewComponent</h2><div>Hello World</div></div></div></body><footer>This is a footer</footer></html>"""
+            """
+                <html><nav>This is a Navbar</nav><body id="layoutviewcomponent"><div><h2>This is the SimpleViewComponent</h2><div>Hello World</div></div></body><footer>This is a footer</footer></html>
+            """.trimIndent()
         assertEndpointReturns("/layout", expectedHtml)
     }
 
-    @Test
-    fun testMultiComponent() {
-        val expectedHtml =
-            """<div><h2>This is the SimpleViewComponent</h2><div>Hello World</div></div><html><nav>This is a Navbar</nav><body><div id="simpleviewcomponent" nestedviewcomponent=""><div><h2>This is the SimpleViewComponent</h2><div>Hello World</div></div></div></body><footer>This is a footer</footer></html>"""
-        assertEndpointReturns("/multi", expectedHtml)
-
-    }
-
     fun assertEndpointReturns(url: String, expectedHtml: String) {
         val response: ResponseEntity<String> = this.testRestTemplate
             .exchange(url, HttpMethod.GET, null, String::class.java)
-
         assertThat(response.statusCode)
             .isEqualTo(HttpStatus.OK)
-        assertThat(response.body?.rmWhitespaceBetweenHtmlTags())
-            .isEqualTo(expectedHtml)
+        Assertions.assertEquals(
+            expectedHtml.rmWhitespaceBetweenHtmlTags(), response.body?.rmWhitespaceBetweenHtmlTags()
+        )
     }
 
     fun String.rmWhitespaceBetweenHtmlTags(): String {
         // Replace whitespace between > and word
-        return this.replace("(?<=>)(\\s*)(?=\\w)".toRegex(), "").run {
-            // Replace whitespace between word and <
-            this.replace("(?<=\\w)(\\s*)(?=<)".toRegex(), "")
-        }.run {
-            // Replace whitespace between > and <
-            this.replace("(?<=>)(\\s*)(?=<)".toRegex(), "")
-        }
+        return this.replace("(?<=>)(\\s*)(?=\\w)".toRegex(), "")
+            .replace("(?<=\\w)(\\s*)(?=<)".toRegex(), "")
+            .replace("(?<=>)(\\s*)(?=<)".toRegex(), "")
+            .replace("\r\n","\n")
+            .trim()
     }
 }
\ No newline at end of file
diff --git a/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.java b/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.java
new file mode 100644
index 0000000..7773cf3
--- /dev/null
+++ b/examples/thymeleaf-java-example/src/main/java/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.java
@@ -0,0 +1,12 @@
+package de.tschuehly.spring.viewcomponent.thymeleaf.application.web.index;
+
+import de.tschuehly.spring.viewcomponent.core.component.ViewComponent;
+import de.tschuehly.spring.viewcomponent.thymeleaf.EmptyViewContext;
+import de.tschuehly.spring.viewcomponent.thymeleaf.ViewContext;
+
+@ViewComponent
+public class IndexViewComponent {
+    public ViewContext render(){
+        return new EmptyViewContext();
+    }
+}
diff --git a/examples/thymeleaf-java-example/src/main/resources/application.properties b/examples/thymeleaf-java-example/src/main/resources/application.properties
index 9991428..8d51d0c 100644
--- a/examples/thymeleaf-java-example/src/main/resources/application.properties
+++ b/examples/thymeleaf-java-example/src/main/resources/application.properties
@@ -1,2 +1 @@
-spring.view-component.local-development=true
 server.port=8082
\ No newline at end of file
diff --git a/examples/thymeleaf-java-example/src/test/java/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafJavaIntegrationTest.java b/examples/thymeleaf-java-example/src/test/java/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafJavaIntegrationTest.java
index 174e50f..eb6e706 100644
--- a/examples/thymeleaf-java-example/src/test/java/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafJavaIntegrationTest.java
+++ b/examples/thymeleaf-java-example/src/test/java/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafJavaIntegrationTest.java
@@ -54,14 +54,14 @@ void testActionComponent() {
                           <script src="http://localhost:35729/livereload.js"></script>
                           <script defer src="/webjars/htmx.org/dist/htmx.min.js"></script>
                         </head>
-                        <body>
+                        <body id="actionviewcomponent">
                         <h2>ViewAction Get CountUp</h2>
 
-                        <button view:action="countUp">Default ViewAction [GET]</button>
+                        <button hx-get="/custompath/countup" hx-target="#actionviewcomponent">Default ViewAction [GET]</button>
                         <h3>0</h3>
 
                         <h2>ViewAction Post AddItem</h2>
-                        <form view:action="addItem">
+                        <form hx-post="/actionviewcomponent/additem" hx-target="#actionviewcomponent">
                           <input type="text" name="item">
                           <button type="submit">Save Item</button>
                         </form>
@@ -85,8 +85,8 @@ void testActionComponent() {
                           <label>
                             Location: <input type="text" id="location" name="location" value="Ludwigsburg">
                           </label>
-                          <button type="submit" view:action="savePersonPut">Save Changes using Put</button>
-                          <button type="submit" view:action="savePersonPatch">Save Changes using Patch</button>
+                          <button type="submit" hx-put="/actionviewcomponent/savepersonput" hx-target="#actionviewcomponent">Save Changes using Put</button>
+                          <button type="submit" hx-patch="/actionviewcomponent/savepersonpatch" hx-target="#actionviewcomponent">Save Changes using Patch</button>
                         </form>
                         </body>
                         </html>
@@ -103,23 +103,24 @@ void testNestedActionComponent() {
                 //language=html
                 """
                         <html>
-                        <body>
+                        <body id="layoutviewcomponent">
                         <nav>
                           This is the NavBar
                         </nav>
-                        <div id="actionviewcomponent" data-nested-view-component><html xmlns="http://www.w3.org/1999/xhtml">
+                        <div id="actionviewcomponent" data-nested-view-component>
+                        <html xmlns="http://www.w3.org/1999/xhtml">
                         <head>
                           <script src="http://localhost:35729/livereload.js"></script>
                           <script defer src="/webjars/htmx.org/dist/htmx.min.js"></script>
                         </head>
-                        <body>
+                        <body id="actionviewcomponent">
                         <h2>ViewAction Get CountUp</h2>
 
-                        <button view:action="countUp">Default ViewAction [GET]</button>
+                        <button hx-get="/custompath/countup" hx-target="#actionviewcomponent">Default ViewAction [GET]</button>
                         <h3>0</h3>
 
                         <h2>ViewAction Post AddItem</h2>
-                        <form view:action="addItem">
+                        <form hx-post="/actionviewcomponent/additem" hx-target="#actionviewcomponent">
                           <input type="text" name="item">
                           <button type="submit">Save Item</button>
                         </form>
@@ -143,12 +144,12 @@ void testNestedActionComponent() {
                           <label>
                             Location: <input type="text" id="location" name="location" value="Ludwigsburg">
                           </label>
-                          <button type="submit" view:action="savePersonPut">Save Changes using Put</button>
-                          <button type="submit" view:action="savePersonPatch">Save Changes using Patch</button>
+                          <button type="submit" hx-put="/actionviewcomponent/savepersonput" hx-target="#actionviewcomponent">Save Changes using Put</button>
+                          <button type="submit" hx-patch="/actionviewcomponent/savepersonpatch" hx-target="#actionviewcomponent">Save Changes using Patch</button>
                         </form>
                         </body>
-                        </html></div>
-
+                        </html>
+                        </div>
                         <footer>
                           This is a footer
                         </footer>
@@ -166,7 +167,7 @@ void testLayoutComponent() {
         var expectedHtml =
                 """
                         <html>
-                        <body>
+                        <body id="layoutviewcomponent">
                         <nav>
                           This is the NavBar
                         </nav>
@@ -198,16 +199,16 @@ private void assertEndpointReturns(String url, String expectedHtml) {
         );
         Assertions.assertNotNull(response.getBody());
         Assertions.assertEquals(
-                expectedHtml,
-                response.getBody()
+                rmWhitespaceBetweenHtmlTags(expectedHtml),
+                rmWhitespaceBetweenHtmlTags(response.getBody())
         );
     }
 
     String rmWhitespaceBetweenHtmlTags(String html) {
-        return html.replace("(?<=>)(\\s*)(?=\\w)", "")
-                .replace("(?<=\\w)(\\s*)(?=<)", "")
-                .replace("(?<=>)(\\s*)(?=<)", "")
-                .replace("\n", "")
+        return html.replaceAll("(?<=>)(\\s*)(?=\\w)", "")
+                .replaceAll("(?<=\\w)(\\s*)(?=<)", "")
+                .replaceAll("(?<=>)(\\s*)(?=<)", "")
+                .replaceAll("\r\n", "")
                 .trim();
     }
 }
diff --git a/examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.kt b/examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.kt
index 52edef1..b893f2e 100644
--- a/examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.kt
+++ b/examples/thymeleaf-kotlin-example/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/application/web/index/IndexViewComponent.kt
@@ -1,8 +1,9 @@
 package de.tschuehly.spring.viewcomponent.thymeleaf.application.web.index
 
 import de.tschuehly.spring.viewcomponent.core.component.ViewComponent
+import de.tschuehly.spring.viewcomponent.thymeleaf.EmptyViewContext
 
 @ViewComponent
 class IndexViewComponent {
-    fun render() = de.tschuehly.spring.viewcomponent.core.EmptyViewContext()
+    fun render() = EmptyViewContext()
 }
\ No newline at end of file
diff --git a/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/JteViewContextAspect.kt b/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/JteViewContextAspect.kt
index 4fff47a..e381ce6 100644
--- a/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/JteViewContextAspect.kt
+++ b/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/JteViewContextAspect.kt
@@ -1,5 +1,6 @@
 package de.tschuehly.spring.viewcomponent.jte
 
+import de.tschuehly.spring.viewcomponent.core.IViewContext
 import gg.jte.TemplateEngine
 import gg.jte.springframework.boot.autoconfigure.JteProperties
 import org.aspectj.lang.annotation.AfterReturning
@@ -24,9 +25,9 @@ class JteViewContextAspect(
     }
 
     @AfterReturning(pointcut = "isViewComponent() && isRenderOrGetMethod()", returning = "viewContext")
-    fun renderInject(viewContext: ViewContext): ViewContext {
-        viewContext.jteTemplateEngine = jteTemplateEngine
-        viewContext.templateSuffix = jteProperties.templateSuffix
+    fun renderInject(viewContext: IViewContext): IViewContext {
+        IViewContext.jteTemplateEngine = jteTemplateEngine
+        IViewContext.templateSuffx = jteProperties.templateSuffix
         return viewContext
     }
 }
\ No newline at end of file
diff --git a/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/ViewContext.kt b/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/ViewContext.kt
index 4d798bd..6d457ab 100644
--- a/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/ViewContext.kt
+++ b/jte/src/main/kotlin/de/tschuehly/spring/viewcomponent/jte/ViewContext.kt
@@ -1,23 +1,21 @@
 package de.tschuehly.spring.viewcomponent.jte
 
 import de.tschuehly.spring.viewcomponent.core.IViewContext
-import de.tschuehly.spring.viewcomponent.core.ViewProperty
-import de.tschuehly.spring.viewcomponent.core.toMap
+import de.tschuehly.spring.viewcomponent.core.IViewContext.Companion.getAttributes
+import de.tschuehly.spring.viewcomponent.core.IViewContext.Companion.getTemplate
+import de.tschuehly.spring.viewcomponent.core.IViewContext.Companion.jteTemplateEngine
 import gg.jte.Content
 import gg.jte.TemplateEngine
 import gg.jte.TemplateOutput
 
 
-class ViewContext(
-) : Content, IViewContext {
-    var templateSuffix: String? = null
-    var jteTemplateEngine: TemplateEngine? = null
-
-
+interface ViewContext : Content, IViewContext {
     override fun writeTo(output: TemplateOutput) {
-        assert(templateSuffix != null)
-        assert(jteTemplateEngine != null)
-        IViewContext.componentTemplate
-//        jteTemplateEngine!!.render("$componentTemplate$templateSuffix", contextAttributes.toMap(), output)
+        (jteTemplateEngine as TemplateEngine).render(
+            getTemplate(this), getAttributes(this),
+            output
+        )
     }
-}
\ No newline at end of file
+}
+
+class EmptyViewContext() : ViewContext
diff --git a/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewComponentTagProcessor.kt b/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewComponentTagProcessor.kt
index 8ef3c00..a2382dc 100644
--- a/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewComponentTagProcessor.kt
+++ b/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ThymeleafViewComponentTagProcessor.kt
@@ -63,12 +63,9 @@ class ThymeleafViewComponentTagProcessor(dialectPrefix: String) :
         SpringContextUtils.getRequestContext(webContext).model.putAll(IViewContext.getAttributes(viewContext))
         webContext.setVariables(IViewContext.getAttributes(viewContext))
 
-        val componentName = viewContext.javaClass.enclosingClass.simpleName.substringBefore("$$")
-        val componentPackage = viewContext.javaClass.enclosingClass.`package`.name.replace(".", "/") + "/"
-
         val modelFactory = webContext.modelFactory
         val viewComponentBody = modelFactory.createText(
-            engine.process("$componentPackage$componentName", webContext)
+            engine.process(IViewContext.getTemplate(viewContext), webContext)
         )
 
         structureHandler.setAttribute("id", viewContext.javaClass.enclosingClass.simpleName.lowercase())
diff --git a/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ViewContext.kt b/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ViewContext.kt
index 7308486..eee708e 100644
--- a/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ViewContext.kt
+++ b/thymeleaf/src/main/kotlin/de/tschuehly/spring/viewcomponent/thymeleaf/ViewContext.kt
@@ -1 +1,7 @@
-package de.tschuehly.spring.viewcomponent.thymeleaf
\ No newline at end of file
+package de.tschuehly.spring.viewcomponent.thymeleaf
+
+import de.tschuehly.spring.viewcomponent.core.IViewContext
+
+interface ViewContext: IViewContext {
+}
+class EmptyViewContext(): ViewContext
\ No newline at end of file