diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 9b02d599e7..0dd4b35463 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Kotlin2JvmCompilerArguments">
-    <option name="jvmTarget" value="11" />
+    <option name="jvmTarget" value="1.8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/libraries/KotlinJavaRuntime.xml b/.idea/libraries/KotlinJavaRuntime.xml
index 1a7265de21..9015f1add7 100644
--- a/.idea/libraries/KotlinJavaRuntime.xml
+++ b/.idea/libraries/KotlinJavaRuntime.xml
@@ -1,19 +1,36 @@
 <component name="libraryTable">
-  <library name="KotlinJavaRuntime">
+  <library name="KotlinJavaRuntime" type="repository">
+    <properties maven-id="org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0" />
     <CLASSES>
       <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib.jar!/" />
       <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar!/" />
       <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-test.jar!/" />
       <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk7.jar!/" />
       <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk8.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.0/kotlin-stdlib-jdk8-1.9.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.9.0/kotlin-stdlib-1.9.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.9.0/kotlin-stdlib-common-1.9.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.0/kotlin-stdlib-jdk7-1.9.0.jar!/" />
     </CLASSES>
-    <JAVADOC />
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.0/kotlin-stdlib-jdk8-1.9.0-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.9.0/kotlin-stdlib-1.9.0-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.9.0/kotlin-stdlib-common-1.9.0-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.0/kotlin-stdlib-jdk7-1.9.0-javadoc.jar!/" />
+    </JAVADOC>
     <SOURCES>
       <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib-sources.jar!/" />
       <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect-sources.jar!/" />
       <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-test-sources.jar!/" />
       <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk7-sources.jar!/" />
       <root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk8-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.0/kotlin-stdlib-jdk8-1.9.0-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/1.9.0/kotlin-stdlib-1.9.0-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-common/1.9.0/kotlin-stdlib-common-1.9.0-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.0/kotlin-stdlib-jdk7-1.9.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/flexmark-util-data/pom.xml b/flexmark-util-data/pom.xml
index ea0491bfcf..603d860159 100644
--- a/flexmark-util-data/pom.xml
+++ b/flexmark-util-data/pom.xml
@@ -12,6 +12,10 @@
     <description>flexmark-java data utility classes</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-util-misc</artifactId>
@@ -28,4 +32,14 @@
             <version>24.0.1</version>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+
+    </build>
+
 </project>
diff --git a/flexmark-util-data/src/main/java/com/vladsch/flexmark/util/data/DataKeyDelegate.kt b/flexmark-util-data/src/main/java/com/vladsch/flexmark/util/data/DataKeyDelegate.kt
new file mode 100644
index 0000000000..6af05c8fca
--- /dev/null
+++ b/flexmark-util-data/src/main/java/com/vladsch/flexmark/util/data/DataKeyDelegate.kt
@@ -0,0 +1,16 @@
+package com.vladsch.flexmark.util.data
+
+import kotlin.reflect.KProperty
+
+@JvmInline
+value class DataKeyDelegate<T : Any>(private val key: DataKey<T>) {
+
+    operator fun setValue(thisRef: MutableDataHolder, property: KProperty<*>, value: T) {
+        key.set(thisRef, value)
+    }
+
+    operator fun getValue(thisRef: MutableDataHolder, property: KProperty<*>): T =
+        key.get(thisRef)
+}
+
+fun <T : Any> key(key: DataKey<T>) = DataKeyDelegate(key)
\ No newline at end of file
diff --git a/flexmark-util-data/src/main/java/com/vladsch/flexmark/util/data/ExtensionDelegates.kt b/flexmark-util-data/src/main/java/com/vladsch/flexmark/util/data/ExtensionDelegates.kt
new file mode 100644
index 0000000000..c0bc3841fb
--- /dev/null
+++ b/flexmark-util-data/src/main/java/com/vladsch/flexmark/util/data/ExtensionDelegates.kt
@@ -0,0 +1,4 @@
+package com.vladsch.flexmark.util.data
+
+import com.vladsch.flexmark.util.misc.Extension
+
diff --git a/flexmark-util-data/src/main/java/com/vladsch/flexmark/util/data/NullableDataKeyDelegate.kt b/flexmark-util-data/src/main/java/com/vladsch/flexmark/util/data/NullableDataKeyDelegate.kt
new file mode 100644
index 0000000000..3c55b41cc7
--- /dev/null
+++ b/flexmark-util-data/src/main/java/com/vladsch/flexmark/util/data/NullableDataKeyDelegate.kt
@@ -0,0 +1,13 @@
+package com.vladsch.flexmark.util.data
+
+import kotlin.reflect.KProperty
+
+@JvmInline
+value class NullableDataKeyDelegate<T : Any>(private val key: NullableDataKey<T>) {
+    operator fun setValue(thisRef: MutableDataHolder, property: KProperty<*>, value: T) {
+        key.set(thisRef, value)
+    }
+
+    operator fun getValue(thisRef: MutableDataHolder, property: KProperty<*>): T? =
+        key.get(thisRef)
+}
\ No newline at end of file
diff --git a/flexmark-util-data/src/main/java/com/vladsch/flexmark/util/data/SharedDataKeys.kt b/flexmark-util-data/src/main/java/com/vladsch/flexmark/util/data/SharedDataKeys.kt
new file mode 100644
index 0000000000..07435ba55f
--- /dev/null
+++ b/flexmark-util-data/src/main/java/com/vladsch/flexmark/util/data/SharedDataKeys.kt
@@ -0,0 +1,41 @@
+package com.vladsch.flexmark.util.data
+
+import com.vladsch.flexmark.util.misc.Extension
+
+fun MutableDataHolder.addExtensions(vararg extensions: Extension) {
+    this.extensions += listOf(*extensions)
+}
+
+var MutableDataHolder.extensions: Collection<Extension> by key(SharedDataKeys.EXTENSIONS)
+var MutableDataHolder.headingNoAtxSpace: Boolean by key(SharedDataKeys.HEADING_NO_ATX_SPACE)
+var MutableDataHolder.escapeHeadingNoAtxSpace: Boolean by key(SharedDataKeys.ESCAPE_HEADING_NO_ATX_SPACE)
+var MutableDataHolder.htmlForTranslator: Boolean by key(SharedDataKeys.HTML_FOR_TRANSLATOR)
+var MutableDataHolder.intellijDummyIdentifier: Boolean by key(SharedDataKeys.INTELLIJ_DUMMY_IDENTIFIER)
+var MutableDataHolder.parseInnerHtmlComments: Boolean by key(SharedDataKeys.PARSE_INNER_HTML_COMMENTS)
+var MutableDataHolder.blankLinesInAst: Boolean by key(SharedDataKeys.BLANK_LINES_IN_AST)
+var MutableDataHolder.translationHtmlBlockTagPattern: String by key(SharedDataKeys.TRANSLATION_HTML_BLOCK_TAG_PATTERN)
+var MutableDataHolder.translationHtmlInlineTagPattern: String by key(SharedDataKeys.TRANSLATION_HTML_INLINE_TAG_PATTERN)
+var MutableDataHolder.translationAutolinkTagPattern: String by key(SharedDataKeys.TRANSLATION_AUTOLINK_TAG_PATTERN)
+var MutableDataHolder.rendererMaxTrailingBlankLines: Int by key(SharedDataKeys.RENDERER_MAX_TRAILING_BLANK_LINES)
+var MutableDataHolder.rendererMaxBlankLines: Int by key(SharedDataKeys.RENDERER_MAX_BLANK_LINES)
+var MutableDataHolder.indentSize: Int by key(SharedDataKeys.INDENT_SIZE)
+var MutableDataHolder.percentEncodeUrls: Boolean by key(SharedDataKeys.PERCENT_ENCODE_URLS)
+var MutableDataHolder.headerIdGeneratorResolveDupes: Boolean by key(SharedDataKeys.HEADER_ID_GENERATOR_RESOLVE_DUPES)
+var MutableDataHolder.headerIdGeneratorToDashChars: String by key(SharedDataKeys.HEADER_ID_GENERATOR_TO_DASH_CHARS)
+var MutableDataHolder.headerIdGeneratorNonDashChars: String by key(SharedDataKeys.HEADER_ID_GENERATOR_NON_DASH_CHARS)
+var MutableDataHolder.headerIdGeneratorNoDupedDashes: Boolean by key(SharedDataKeys.HEADER_ID_GENERATOR_NO_DUPED_DASHES)
+var MutableDataHolder.headerIdGeneratorNonAsciiToLowercase: Boolean by key(SharedDataKeys.HEADER_ID_GENERATOR_NON_ASCII_TO_LOWERCASE)
+var MutableDataHolder.headerIdRefTextTrimLeadingSpaces: Boolean by key(SharedDataKeys.HEADER_ID_REF_TEXT_TRIM_LEADING_SPACES)
+var MutableDataHolder.headerIdRefTextTrimTrailingSpaces: Boolean by key(SharedDataKeys.HEADER_ID_REF_TEXT_TRIM_TRAILING_SPACES)
+var MutableDataHolder.headerIdAddEmojiShortcut: Boolean by key(SharedDataKeys.HEADER_ID_ADD_EMOJI_SHORTCUT)
+var MutableDataHolder.renderHeaderId: Boolean by key(SharedDataKeys.RENDER_HEADER_ID)
+var MutableDataHolder.generateHeaderId: Boolean by key(SharedDataKeys.GENERATE_HEADER_ID)
+var MutableDataHolder.doNotRenderLinks: Boolean by key(SharedDataKeys.DO_NOT_RENDER_LINKS)
+var MutableDataHolder.formatterMaxBlankLines: Int by key(SharedDataKeys.FORMATTER_MAX_BLANK_LINES)
+var MutableDataHolder.formatterMaxTrailingBlankLines: Int by key(SharedDataKeys.FORMATTER_MAX_TRAILING_BLANK_LINES)
+var MutableDataHolder.blockQuoteBlankLines: Boolean by key(SharedDataKeys.BLOCK_QUOTE_BLANK_LINES)
+var MutableDataHolder.applySpecialLeadInHandlers: Boolean by key(SharedDataKeys.APPLY_SPECIAL_LEAD_IN_HANDLERS)
+var MutableDataHolder.escapeSpecialChars: Boolean by key(SharedDataKeys.ESCAPE_SPECIAL_CHARS)
+var MutableDataHolder.escapeNumberedLeadIn: Boolean by key(SharedDataKeys.ESCAPE_NUMBERED_LEAD_IN)
+var MutableDataHolder.unescapeSpecialChars: Boolean by key(SharedDataKeys.UNESCAPE_SPECIAL_CHARS)
+var MutableDataHolder.runningTests: Boolean by key(SharedDataKeys.RUNNING_TESTS)
diff --git a/pom.xml b/pom.xml
index 3a2a62832b..b168a2f358 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,7 @@
         <flexmark.javadoc.location>${project.basedir}/target/apidocs/</flexmark.javadoc.location>
         <!-- Don't automatically publish artifacts to Central, we might want to inspect them first. -->
         <nexus.staging.autoRelease>false</nexus.staging.autoRelease>
+        <kotlin.version>1.9.10</kotlin.version>
     </properties>
 
     <distributionManagement>
@@ -136,6 +137,27 @@
                         </descriptors>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-maven-plugin</artifactId>
+                    <version>${kotlin.version}</version>
+
+                    <executions>
+                        <execution>
+                            <id>compile</id>
+                            <goals>
+                                <goal>compile</goal>
+                            </goals>
+                        </execution>
+
+                        <execution>
+                            <id>test-compile</id>
+                            <goals>
+                                <goal>test-compile</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>
@@ -534,6 +556,13 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <!--  Kotlin runtime dependencies -->
+            <dependency>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-stdlib</artifactId>
+                <version>${kotlin.version}</version>
+            </dependency>
+
             <!-- Common test dependencies -->
             <dependency>
                 <groupId>junit</groupId>