diff --git a/cli/package.json b/cli/package.json
index f2f7ad0..400c185 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -83,6 +83,7 @@
     "ts-jest": "^29.2.5",
     "ts-loader": "^9.5.1",
     "tsx": "^4.11.0",
+    "yaml": "^2.7.0",
     "webpack": "^5.91.0",
     "webpack-cli": "^5.1.4"
   },
diff --git a/cli/src/commands/connect.ts b/cli/src/commands/connect.ts
index ba6ea3e..51dfa17 100644
--- a/cli/src/commands/connect.ts
+++ b/cli/src/commands/connect.ts
@@ -21,6 +21,7 @@ import { runWizard } from '../connect/wizard/run_wizard'
 import { callParser, handleMessages } from '../connect/parser_executables'
 import { fromError } from 'zod-validation-error'
 import { ParseRequestPayload, ParseResponsePayload } from '../connect/parser_executable_types'
+import { parse } from 'yaml'
 import z from 'zod'
 import { withUpdateCheck } from '../common/updates'
 import { exitWithFeedbackMessage } from '../connect/helpers'
@@ -187,15 +188,38 @@ function transformDocFromParser(
   }
 }
 
-export function parseRawFile(filePath: string, label: string | undefined): CodeConnectJSON {
-  const fileContent = fs.readFileSync(filePath, 'utf-8')
+const getRawFileData = (fileContent: string) => {
   const [firstLine, ...templateLines] = fileContent.split('\n')
-  const figmaNodeUrl = firstLine.replace(/\/\/\s*url=/, '').trim()
-  const template = templateLines.join('\n')
+  const delimeterStart = '/*---'
+  const delimeterEnd = '---*/'
+  if (firstLine !== delimeterStart) {
+    return {
+      template: templateLines.join('\n'),
+      figmaNode: firstLine.replace(/\/\/\s*url=/, '').trim(),
+    }
+  }
+  const nextDelimeterIndex = templateLines.findIndex((line) => line === delimeterEnd)
+  if (nextDelimeterIndex === -1) {
+    return {
+      template: '',
+      figmaNode: '',
+    }  // invalid data
+  }
+  const data = templateLines.slice(0, nextDelimeterIndex).join('\n')
+  const { url: figmaNode, component, variant, links } = parse(data);
+  return {
+    component,
+    variant,
+    links,
+    figmaNode,
+    template: templateLines.slice(nextDelimeterIndex + 1).join('\n'),
+  };
+};
 
+export function parseRawFile(filePath: string, label: string | undefined): CodeConnectJSON {
+  const fileContent = fs.readFileSync(filePath, 'utf-8')
   return {
-    figmaNode: figmaNodeUrl,
-    template,
+    ...getRawFileData(fileContent),
     // nestable by default unless user specifies otherwise
     templateData: { nestable: true },
     language: 'raw',