diff --git a/lua/parrot/config.lua b/lua/parrot/config.lua
index 1e5d45e..f86a89b 100644
--- a/lua/parrot/config.lua
+++ b/lua/parrot/config.lua
@@ -226,15 +226,11 @@ local defaults = {
   template_selection = [[
   I have the following content from {{filename}}:
 
-  <SELECTION>
   ```{{filetype}}
   {{selection}}
   ```
-  </SELECTION>
 
-  <FURTHER CONTEXT>
   {{command}}
-  </FURTHER CONTEXT>
   ]],
   template_rewrite = [[
   I have the following content from {{filename}}:
diff --git a/lua/parrot/utils.lua b/lua/parrot/utils.lua
index dd74d14..3581677 100644
--- a/lua/parrot/utils.lua
+++ b/lua/parrot/utils.lua
@@ -1,4 +1,5 @@
 local pft = require("plenary.filetype")
+local Placeholders = require("parrot.placeholders")
 
 local M = {}
 
@@ -256,8 +257,9 @@ M.append_selection = function(params, origin_buf, target_buf, template_selection
     local fname = vim.api.nvim_buf_get_name(origin_buf)
     local filecontent = table.concat(vim.api.nvim_buf_get_lines(origin_buf, 0, -1, false), "\n")
     local multifilecontent = M.get_all_buffer_content()
-    local rendered =
-      M.template_render(template_selection, "", selection, filetype, fname, filecontent, multifilecontent)
+    local _placeholders =
+      Placeholders:new(template_selection, "", selection, filetype, fname, filecontent, multifilecontent)
+    local rendered = _placeholders:return_render()
     if rendered then
       selection = rendered
     end