diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..8630e46c0
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,3 @@
+/build
+/jbake-dist/build
+.gradle
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 000000000..a3b32ad0f
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,50 @@
+name: Build
+
+on:
+    push:
+        branches:
+            - 'master'
+            - 'chore/**'
+            - 'feat/**'
+            - 'fix/**'
+    pull_request:
+        branches:
+            - 'master'
+
+jobs:
+    build:
+        name: Build
+        strategy:
+            fail-fast: false
+            matrix:
+                os: [ ubuntu-latest, macos-latest, windows-latest ]
+        runs-on: ${{ matrix.os }}
+
+        steps:
+            - uses: actions/checkout@v5
+
+            - name: Set up Java
+              uses: actions/setup-java@v5
+              with:
+                  java-version: 21
+                  distribution: 'temurin'
+
+            - name: Setup Gradle
+              uses: gradle/actions/setup-gradle@v5
+
+            - name: Build-win
+              if: runner.os == 'Windows'
+              shell: cmd
+              run: gradlew.bat -Dfile.encoding=UTF-8 build -S
+            - name: Build-nix
+              if: runner.os != 'Windows'
+              run: ./gradlew build -S
+
+            - name: Upload Reports
+              uses: actions/upload-artifact@v4
+              if: failure()
+              with:
+                  name: reports-${{ runner.os }}
+                  path: |
+                      jbake-core/build
+                      jbake-dist/build
diff --git a/.github/workflows/early-access.yml b/.github/workflows/early-access.yml
new file mode 100644
index 000000000..460dcd09c
--- /dev/null
+++ b/.github/workflows/early-access.yml
@@ -0,0 +1,48 @@
+name: EarlyAccess
+
+on:
+    push:
+        branches: [ master ]
+
+jobs:
+    earlyaccess:
+        name: EarlyAccess
+        if: github.repository == 'jbake-org/jbake'
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v5
+              with:
+                  fetch-depth: 0
+
+            - name: Set up Java
+              uses: actions/setup-java@v5
+              with:
+                  java-version: 21
+                  distribution: 'temurin'
+
+            - name: Setup Gradle
+              uses: gradle/actions/setup-gradle@v5
+
+            - name: Build
+              run: ./gradlew build -S
+
+            - name: Release
+              run: ./gradlew jreleaserRelease -S
+              env:
+                  JRELEASER_GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+                  JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+                  JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
+                  JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
+                  JRELEASER_SDKMAN_CONSUMER_KEY: ${{ secrets.SDKMAN_CONSUMER_KEY }}
+                  JRELEASER_SDKMAN_CONSUMER_TOKEN: ${{ secrets.SDKMAN_CONSUMER_TOKEN }}
+
+            - name: JReleaser output
+              if: always()
+              uses: actions/upload-artifact@v4
+              with:
+                  name: jreleaser-logs
+                  path: |
+                      jbake-dist/build/jreleaser/trace.log
+                      jbake-dist/build/jreleaser/output.properties
diff --git a/.travis.yml b/.travis.yml
index 859438b56..0d8f20a36 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,33 +16,36 @@ install: true
 script:
 - "./gradlew check --stacktrace"
 
-jdk:
-  - openjdk15
-  - openjdk11
-
 jobs:
   include:
 
-  - jdk: openjdk15
-    os: osx
+  - jdk: openjdk21
+
+  - jdk: openjdk17
 
   - jdk: openjdk11
-    os: osx
 
-  - stage: Quality Check
-    name: sonarqube
-    jdk: openjdk11
-    script:
-    - "./gradlew jacocoRootReport sonarqube -i --stacktrace"
+  - os: osx
+    osx_image: xcode13.2 # defaults to openjdk17
+
+# below config fails
+#  - os: osx
+#    osx_image: xcode9.4
+#    jdk: openjdk11
 
-  - stage: Quality Check
-    name: coveralls
-    jdk: openjdk11
-    script:
-    - "./gradlew -PskipSigning jacocoRootReport coveralls -i --stacktrace"
+#  - stage: Quality Check
+#    name: sonarqube
+#    jdk: openjdk11
+#    script:
+#    - "./gradlew jacocoRootReport sonarqube -i --stacktrace"
+#
+#  - stage: Quality Check
+#    name: coveralls
+#    jdk: openjdk11
+#    script:
+#    - "./gradlew -PskipSigning jacocoRootReport coveralls -i --stacktrace"
 
 notifications:
-  irc: "irc.freenode.org#jbake"
   webhooks:
     urls:
       - https://webhooks.gitter.im/e/2d332fabb02dba68a36b
diff --git a/BUILD.adoc b/BUILD.adoc
index 603edb689..dc4f0ffea 100644
--- a/BUILD.adoc
+++ b/BUILD.adoc
@@ -25,7 +25,7 @@ To get an overview of all available tasks with a short description run `./gradle
 
 == Structure
 
-There are 3 projects
+There are 4 projects:
 
 root aka. jbake-base::
     configures subprojects, jacoco execution aggregation and coveralls
@@ -34,6 +34,9 @@ jbake-core::
     - the core library. produces jbake-core-{version}.jar (`build/libs`)
     - publishes to bintray maven repository jbake-core
 
+jbake-maven-plugin::
+    - the JBake maven plugin, build by Gradle too
+
 jbake-dist::
     - bundles the cli to an distribution (`build/distribution`)
     - publishes to bintray binary repository jbake
@@ -161,36 +164,62 @@ plugin:: https://docs.gradle.org/current/userguide/application_plugin.html
 
 WARNING: Never add credentials to the repository
 
-=== publish to bintray
+=== github release
+
+Bump desired project version in the projects `gradle.properties` file.
 
-You can publish to bintray with
+Like
 
 ----
-./gradlew bintrayUpload
+version = 2.7.0
 ----
 
-If you want to see what's going on without publishing
+Commit and push to origin at github.
 
 ----
-./gradlew -PbintrayDryRun=true bU --info
+./gradlew signArchives
+./gradlew githubRelease
 ----
 
-You need to add two properties to your local gradle.properties file (_~/.gradle/gradle.properties_).
+The task will create a tag for you and create a release. Additionaly it uploads the binary distribution and the corresponding signature to the release.
 
-    bintrayUsername=username
-    bintrayKey=secret
+[NOTE]
+====
+You need to add some properties to your local gradle.properties file (_~/.gradle/gradle.properties_)
 
-It's possible to change the organization and repository too.
-The properties are called _bintrayOrg_ and _bintrayRepo_.
-To publish to your private repository in an example repository run
+----
+github.token=<access token>
+github.release.owner=jbake-org
+github.release.repo=jbake
+----
+
+It's also possible to dry-run this task. Execute `export GITHUB_RELEASE_DRY_RUN=true` in your terminal.
+====
+
+plugin:: https://github.com/BreadMoirai/github-release-gradle-plugin
+
+=== publish to nexus sonatype
+
+You can publish to nexus with
 
 ----
-gradle -PbintrayOrg='' -PbintrayRepo=example bU
+./gradlew publishToSonatype
 ----
 
-The default values can be found in the _gradle.properties_ file at the root of this repository.
+The task will create a staging repository. You need to close and publish it manually.
+You can automate this process with the other tasks like `closeSonatypeStagingRepository` and `closeAndReleaseSonatypeStagingRepository`.
+
+For more information see:
+
+* https://github.com/gradle-nexus/publish-plugin
+* https://central.sonatype.org/pages/ossrh-guide.html
+
+You need to add two properties to your local gradle.properties file (_~/.gradle/gradle.properties_).
+
+    sonatypeUsername=username
+    sonatypePassword=secret
 
-plugin:: https://plugins.gradle.org/plugin/com.jfrog.bintray
+plugin:: https://plugins.gradle.org/plugin/io.github.gradle-nexus.publish-plugin
 
 === publish to sdkman
 
diff --git a/CONTRIBUTING.asciidoc b/CONTRIBUTING.asciidoc
index a22c2253b..e3ba82bd3 100644
--- a/CONTRIBUTING.asciidoc
+++ b/CONTRIBUTING.asciidoc
@@ -96,5 +96,5 @@ review the JBake documentation and make...
 
 === Supported Java Versions
 
-At present JBake supports Java 7 and above and any contributions shouldn't use Java 8+ syntax, please see
-the {uri-issues}[roadmap] for when support for Java 8 is planned.
\ No newline at end of file
+At present JBake supports Java 8 and above so any contributions shouldn't use Java 9+ syntax, please see
+the {uri-issues}[roadmap] for when support for later Java versions is planned.
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..e17527c5c
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,44 @@
+FROM gradle:6.8-jdk11 as builder
+
+LABEL maintainer="https://jbake.org/community/team.html"
+
+ENV JBAKE_HOME=/opt/jbake
+
+RUN mkdir -p ${JBAKE_HOME}
+COPY . /usr/src/jbake
+
+RUN set -o errexit -o nounset \
+    && echo "Building JBake" \
+    && cd /usr/src/jbake \
+    && gradle --no-daemon installDist \
+    && cp -r jbake-dist/build/install/jbake/* $JBAKE_HOME \
+    && rm -r ~/.gradle /usr/src/jbake
+
+FROM eclipse-temurin:11-jre-alpine
+
+ENV JBAKE_USER=jbake
+ENV JBAKE_HOME=/opt/jbake
+ENV PATH ${JBAKE_HOME}/bin:$PATH
+ENV TZ=UTC
+
+RUN apk --no-cache update && \
+    apk --no-cache upgrade && \
+    apk add --update tzdata && \
+    rm -rf /var/cache/apk/*
+
+RUN echo ${TZ} > /etc/timezone
+
+RUN adduser -D -u 1000 -g "" ${JBAKE_USER} ${JBAKE_USER}
+
+USER ${JBAKE_USER}
+
+COPY --from=builder /opt/jbake /opt/jbake
+
+WORKDIR /mnt/site
+
+VOLUME ["/mnt/site"]
+
+ENTRYPOINT ["jbake"]
+CMD ["-b"]
+
+EXPOSE 8820
diff --git a/README.asciidoc b/README.asciidoc
index f52683339..5e5383d65 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -1,18 +1,17 @@
 = JBake
 Jonathan Bullock
-2017-05-11
+2021-04-13
 :idprefix:
 
-== JBake
-
 http://jbake.org[JBake] is a Java based open source static site/blog generator for developers.
 
+image:https://img.shields.io/github/v/release/jbake-org/jbake?label=download&sort=semver["GitHub Release Download", link="https://github.com/jbake-org/jbake/releases/latest"]
+image:https://img.shields.io/maven-central/v/org.jbake/jbake-core.svg["Maven Download", link="http://jbake.org/download.html#maven"]
+image:https://img.shields.io/homebrew/v/jbake.svg["Homebrew Download", link="http://jbake.org/download.html#homebrew"]
+
 image:https://img.shields.io/travis/com/jbake-org/jbake/master.svg["Build Status", link="https://travis-ci.com/github/jbake-org/jbake"]
 image:https://ci.appveyor.com/api/projects/status/2q7hvg03wsjx953b?svg=true["Appveyor Status", link="https://ci.appveyor.com/project/jbake-org/jbake"]
 image:https://img.shields.io/coveralls/jbake-org/jbake/master.svg["Coverage Status", link="https://coveralls.io/r/jbake-org/jbake"]
-image:https://img.shields.io/maven-central/v/org.jbake/jbake-core.svg["Maven Download", link="http://jbake.org/download.html#maven"]
-image:https://api.bintray.com/packages/jbake/maven/jbake-core/images/download.svg["Bintray Download", link="https://bintray.com/jbake/maven/jbake-core/_latestVersion"]
-image:https://img.shields.io/homebrew/v/jbake.svg["Homebrew Download", link="http://jbake.org/download.html#homebrew"]
 
 image:https://badges.gitter.im/jbake-org/jbake.svg["Gitter Chat", link="https://gitter.im/jbake-org/jbake"]
 
@@ -55,6 +54,46 @@ Talk to other users of JBake on the forum:
 
 * http://groups.google.com/group/jbake-user[Forum]
 
+== Docker Image
+
+The image uses the official https://hub.docker.com/r/adoptopenjdk/openjdk11/[adoptopenjdk/openjdk11:alpine] image
+for building a distribution of JBake and
+https://hub.docker.com/r/adoptopenjdk/openjdk11/[adoptopenjdk/openjdk11:alpine-jre] for runtime.
+
+=== Build
+
+To build the Docker image:
+
+----
+$ docker build -t jbake/jbake:latest .
+----
+
+=== Usage
+
+To execute JBake via Docker run this from project directory:
+
+----
+$ docker run --rm -u jbake -v "$PWD":/mnt/site jbake/jbake:latest
+----
+
+This command will execute using the jbake user to avoid running as root and will mount the current working directory as `/mnt/site`
+in the Docker container where JBake is expecting your project files to be. By default the Docker image will execute a bake `-b` only.
+
+If you want to bake and serve your project using the Docker image then you'll need to override the default command:
+
+----
+$ docker run --rm -u jbake -v "$PWD":/mnt/site -p 8820:8820 jbake/jbake:latest -b -s
+----
+
+This command will also expose port 8820 from the container, you'll also need to set the following option in your `jbake.properties` file:
+
+----
+server.hostname=0.0.0.0
+----
+
+NOTE: Docker image timezone is _UTC_. This may affect the date and time expected in output content. To set different timezone, add `TZ` environment variable and set value to required https://en.wikipedia.org/wiki/List_of_tz_database_time_zones[timezone^]. Example - `docker run --rm -u jbake  -e TZ=America/New_York -v "$PWD":/mnt/site jbake/jbake:latest`
+
+
 == Build System
 
 The project uses http://gradle.org[Gradle] 4.9+ as the build system.
diff --git a/appveyor.yml b/appveyor.yml
index b6ef6ed20..2875b1793 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,9 +8,8 @@ clone_depth: 10
 environment:
   TERM: dumb
   matrix:
-    - JAVA_HOME: C:\Program Files\Java\jdk1.8.0
     - JAVA_HOME: C:\Program Files\Java\jdk11
-    - JAVA_HOME: C:\Program Files\Java\jdk15
+    - JAVA_HOME: C:\Program Files\Java\jdk17
 
 install:
   - SET PATH=%JAVA_HOME%\bin;%PATH%
@@ -20,6 +19,6 @@ install:
   - gradlew.bat --version
   - file C:\projects\jbake\jbake-core\src\test\resources\fixture\jbake.properties
 build_script:
-  - gradlew.bat -i assemble
+  - gradlew.bat -Dfile.encoding=UTF-8 -i assemble
 test_script:
-  - gradlew.bat -i -S check
+  - gradlew.bat -Dfile.encoding=UTF-8 -i -S check
diff --git a/build.gradle b/build.gradle
index f8c7dbde2..248290743 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,9 @@
 plugins {
+    id "io.github.gradle-nexus.publish-plugin"  version "$nexusPublishPluginVersion"
+    id 'com.github.ben-manes.versions'          version "$versionsPluginVersion"
+    id 'org.jreleaser'                          version "$jreleaserVersion" apply false
     id "eclipse"
     id "idea"
-    id "io.sdkman.vendors"              version "2.0.0"     apply false
-    id "com.jfrog.bintray"              version "1.8.5"     apply false
-    id "com.github.kt3k.coveralls"      version "2.10.2"    apply false
-    id "org.sonarqube"                  version "3.1.1"     apply false
-    id 'com.github.ben-manes.versions'  version '0.38.0'
-    id "nebula.optional-base"           version "5.0.3"     apply false
 }
 
 // common variables
@@ -21,168 +18,24 @@ ext {
     sonarDefaultProjectKey = "org.jbake:jbake-base:jbake-core"
     sonarURL = System.getenv("SONARHOST") ?: sonarDefaultURL
     sonarProjectKey = System.getenv("SONARPROJECTKEY") ?: sonarDefaultProjectKey
+    isReleaseVersion = !version.endsWith("SNAPSHOT")
 }
 
-/**
- * Apply coveralls to the root project as we just need it here to send the
- * aggregated coverage execution data from the jacocoRootReport task
- */
-apply plugin: 'com.github.kt3k.coveralls'
-
-/**
- * Apply jacoco plugin to all projects and add jcenter as default repository
- */
-allprojects {
-    apply plugin: 'jacoco'
-
-    if ( JavaVersion.current().isJava8Compatible() ) {
-
-        apply plugin: 'checkstyle'
-
-        tasks.withType(Checkstyle) {
-            reports {
-                xml.enabled false
-                html.enabled true
-            }
-        }
-
-    }
-
+nexusPublishing {
     repositories {
-        jcenter()
-    }
-
-    jacoco {
-        toolVersion = jacocoVersion
+        sonatype()
     }
-
 }
 
-/**
- * Common setup for all subprojects
- */
-subprojects {
-
-    apply plugin: 'java'
-    apply plugin: 'nebula.optional-base'
-
-    // We do not publish any jars from the jbake-dist project
-    if ( project.name != "jbake-dist" ) {
-      apply from: "$rootDir/gradle/maven-publishing.gradle"
-      apply from: "$rootDir/gradle/signing.gradle"
-      apply from: "$rootDir/gradle/publishing.gradle"
-    }
-
-    // add source and target compatibility for all JavaCompile tasks
-    tasks.withType(JavaCompile) {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
-    }
-
-    test {
-        useJUnitPlatform()
-
-        testLogging {
-            events "passed", "skipped", "failed"
-            exceptionFormat "full"
-        }
-    }
-
-    dependencies {
-        implementation "org.slf4j:slf4j-api:$slf4jVersion"
-        implementation "org.slf4j:jul-to-slf4j:$slf4jVersion"
-        implementation "org.slf4j:jcl-over-slf4j:$slf4jVersion"
-        implementation "ch.qos.logback:logback-classic:$logbackVersion", optional
-        implementation "ch.qos.logback:logback-core:$logbackVersion", optional
-
-        testImplementation "org.junit-pioneer:junit-pioneer:$junitPioneer"
-        testImplementation "org.junit.jupiter:junit-jupiter-api:$junit5Version"
-        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit5Version"
-        // compatibility for Junit 4 test
-        testCompileOnly "junit:junit:$junit4Version"
-        testRuntimeOnly "org.junit.vintage:junit-vintage-engine:$junit5Version"
-
-        testImplementation "org.assertj:assertj-core:$assertjCoreVersion"
-        testImplementation "org.mockito:mockito-core:$mockitoVersion"
-        testImplementation "org.mockito:mockito-junit-jupiter:$mockitoVersion"
-        testImplementation 'org.itsallcode:junit5-system-extensions:1.1.0'
-    }
-
-    dependencyUpdates.resolutionStrategy {
-        componentSelection { rules ->
-            rules.all { ComponentSelection selection ->
-                boolean rejected = ['alpha', 'beta', 'rc', 'cr', 'm'].any { qualifier ->
-                    selection.candidate.version ==~ /(?i).*[.-]?${qualifier}[.\d-]*/
-                }
-                if (rejected) {
-                    selection.reject('Release candidate')
-                }
+dependencyUpdates.resolutionStrategy {
+    componentSelection { rules ->
+        rules.all { ComponentSelection selection ->
+            boolean rejected = ['alpha', 'beta', 'rc', 'cr', 'm'].any { qualifier ->
+                selection.candidate.version ==~ /(?i).*[.-]?${qualifier}[.\d-]*/
+            }
+            if (rejected) {
+                selection.reject('Release candidate')
             }
         }
     }
-
-    //set jvm for all Test tasks (like test and smokeTest)
-    tasks.withType(Test) {
-
-        def args = ['-Xms512m', '-Xmx3g', '-Dorientdb.installCustomFormatter=false=false','-Djna.nosys=true']
-
-        /**
-         * jdk9 build is unable to determine the amount of MaxDirectMemorySize
-         * See https://pastebin.com/ECvQeHx0
-         */
-        if ( JavaVersion.current().java9Compatible ) {
-            args << '-XX:MaxDirectMemorySize=2g'
-        }
-        jvmArgs args
-    }
-
-    jacocoTestReport {
-        reports {
-            xml.enabled = true // coveralls plugin depends on xml format report
-            html.enabled = true
-        }
-    }
-
-    jacocoTestReport.dependsOn test
-}
-
-task jacocoMerge(type: JacocoMerge) {
-    description 'Merge all testreport execution data from subprojects excluding jbake-dist'
-    dependsOn subprojects.test
-    executionData subprojects.findAll{it.name!="jbake-dist"}.jacocoTestReport.executionData
-}
-
-task jacocoRootReport(type: JacocoReport, group: 'Coverage reports') {
-    description = 'Generates an aggregate report from all subprojects'
-    dependsOn jacocoMerge
-
-    sourceDirectories.from files(subprojects.sourceSets.main.allSource.srcDirs)
-    classDirectories.from files(subprojects.sourceSets.main.output)
-    executionData.from jacocoMerge.executionData
-
-    reports {
-        html.enabled = true
-        xml.enabled = true
-    }
-}
-
-task testReport(type: TestReport) {
-    description "Generate an aggregated Testreport for all projects"
-
-    destinationDir = file("$buildDir/reports/allTests")
-    // Include the results from the `test` task in all subprojects
-    reportOn subprojects*.test
-}
-
-coveralls {
-    jacocoReportPath = "${buildDir}/reports/jacoco/jacocoRootReport/jacocoRootReport.xml"
-}
-
-tasks.coveralls {
-    group = 'Coverage reports'
-    description = 'Uploads the aggregated coverage report to Coveralls'
-
-    dependsOn jacocoRootReport
-    // Skip Task if not run on CI Server
-    onlyIf { System.env.'CI' }
 }
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
new file mode 100644
index 000000000..678405245
--- /dev/null
+++ b/buildSrc/build.gradle
@@ -0,0 +1,3 @@
+plugins {
+    id 'groovy-gradle-plugin'
+}
diff --git a/jbake-core/src/test/resources/fixture/ignorablefolder/.jbakeignore b/buildSrc/settings.gradle
similarity index 100%
rename from jbake-core/src/test/resources/fixture/ignorablefolder/.jbakeignore
rename to buildSrc/settings.gradle
diff --git a/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle b/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle
new file mode 100644
index 000000000..d7cbd3a4d
--- /dev/null
+++ b/buildSrc/src/main/groovy/org/jbake/convention/org.jbake.convention.java-common.gradle
@@ -0,0 +1,142 @@
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
+
+plugins {
+    id 'java'
+    id 'jacoco'
+    id 'checkstyle'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation "org.slf4j:slf4j-api:$slf4jVersion"
+    implementation "org.slf4j:jul-to-slf4j:$slf4jVersion"
+    implementation "org.slf4j:jcl-over-slf4j:$slf4jVersion"
+    implementation "ch.qos.logback:logback-classic:$logbackVersion"
+    implementation "ch.qos.logback:logback-core:$logbackVersion"
+
+    testImplementation "org.junit-pioneer:junit-pioneer:$junitPioneer"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junit5Version"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit5Version"
+    // compatibility for Junit 4 test
+    testCompileOnly "junit:junit:$junit4Version"
+    testRuntimeOnly "org.junit.vintage:junit-vintage-engine:$junit5Version"
+
+    testImplementation "org.assertj:assertj-core:$assertjCoreVersion"
+    testImplementation "org.mockito:mockito-core:$mockitoVersion"
+    testImplementation "org.mockito:mockito-junit-jupiter:$mockitoVersion"
+}
+
+tasks.withType(JavaCompile).configureEach {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}
+
+//set jvm for all Test tasks (like test and smokeTest)
+tasks.withType(Test).configureEach {
+
+    def args = ['-Xms512m', '-Xmx3g', '-Dorientdb.installCustomFormatter=false=false', '-Djna.nosys=true']
+
+    /**
+     * jdk9 build is unable to determine the amount of MaxDirectMemorySize
+     * See https://pastebin.com/ECvQeHx0
+     */
+    if (JavaVersion.current().java9Compatible) {
+        args << '-XX:MaxDirectMemorySize=2g'
+    }
+    jvmArgs = args
+}
+
+tasks.register("javadocJar", Jar) {
+    archiveClassifier.set('javadoc')
+    from javadoc
+}
+
+tasks.register("sourcesJar", Jar) {
+
+    it.archiveClassifier.set('sources')
+    from sourceSets.main.allSource
+}
+
+tasks.withType(AbstractArchiveTask).configureEach {
+    preserveFileTimestamps = false
+    reproducibleFileOrder = true
+}
+
+tasks.register("commitBuildAndDate", Exec) {
+    group = "build"
+    description = "determine build date and time from last commit"
+
+    executable "git"
+    args "show", "-s", "--format=%cI", "HEAD"
+
+    standardOutput = new ByteArrayOutputStream()
+
+    ext.commitDate = {
+        def zonedDateTime = ZonedDateTime.parse(standardOutput.toString().trim())
+        return zonedDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss'['VV']'"))
+    }
+
+    ext.date = {
+        def zonedDateTime = ZonedDateTime.parse(standardOutput.toString().trim())
+        return zonedDateTime.format(DateTimeFormatter.ofPattern('yyyy-MM-dd'))
+    }
+
+    ext.time = {
+        def zonedDateTime = ZonedDateTime.parse(standardOutput.toString().trim())
+        return zonedDateTime.format(DateTimeFormatter.ofPattern('HH:mm:ss.SSSZ'))
+    }
+}
+
+tasks.register("commitHash", Exec) {
+    group = "build"
+    description = "determine build commit hash for last commit"
+
+    executable "git"
+    args "show", "-s", "--format=%h", "HEAD"
+
+    standardOutput = new ByteArrayOutputStream()
+
+    ext.abbreviated = {
+        return standardOutput.toString().trim()
+    }
+}
+
+processResources.dependsOn(tasks.commitBuildAndDate)
+processResources.dependsOn(tasks.commitHash)
+
+test {
+    useJUnitPlatform()
+
+    testLogging {
+        events "passed", "skipped", "failed"
+        exceptionFormat = "full"
+    }
+
+    jacoco {
+        excludes = ["**/*OrientSqlTokenManager*"]
+    }
+}
+
+jacoco {
+    toolVersion = jacocoVersion
+}
+
+jacocoTestReport {
+    reports {
+        xml.required.set true // coveralls plugin depends on xml format report
+        html.required.set true
+    }
+}
+
+jacocoTestReport.dependsOn test
+
+tasks.withType(Checkstyle).configureEach {
+    reports {
+        xml.required.set false
+        html.required.set true
+    }
+}
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 63e20f426..560f649a5 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -20,7 +20,9 @@
     <module name="TreeWalker">
         <module name="Indentation"/>
         <module name="AvoidStarImport"/>
-        <module name="NeedBraces"/>
+        <module name="NeedBraces">
+            <property name="allowSingleLineStatement" value="true"/>
+        </module>
         <module name="LeftCurly">
             <property name="option" value="eol"/>
         </module>
diff --git a/gradle.properties b/gradle.properties
index 325bdaae0..bee94706e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 group                       = org.jbake
-version                     = 2.6.6
+version                     = 2.7.0-SNAPSHOT
 description                 = JBake is a Java based open source static site/blog generator for developers.
 
 website                     = http://jbake.org
@@ -7,42 +7,50 @@ issues                      = https://github.com/jbake-org/jbake/issues
 vcs                         = https://github.com/jbake-org/jbake/
 
 # runtime dependencies
-asciidoctorjVersion         = 2.4.3
-asciidoctorjDiagramVersion  = 2.1.0
+asciidoctorjVersion         = 3.0.1
+asciidoctorjDiagramVersion  = 3.0.1
 args4jVersion               = 2.33
-commonsIoVersion            = 2.8.0
-commonsConfigurationVersion = 1.10
-commonsLangVersion          = 3.12.0
-commonsVfs2Version          = 2.7.0
-freemarkerVersion           = 2.3.31
-flexmarkVersion             = 0.62.2
-groovyVersion               = 3.0.7
-jettyServerVersion          = 9.4.36.v20210114
+commonsIoVersion            = 2.21.0
+commonsConfigurationVersion = 2.12.0
+commonsBeanutilsVersion     = 1.11.0
+commonsLangVersion          = 3.19.0
+commonsVfs2Version          = 2.10.0
+freemarkerVersion           = 2.3.34
+flexmarkVersion             = 0.64.8
+groovyVersion               = 3.0.25
+jettyServerVersion          = 11.0.26
 jsonSimpleVersion           = 1.1.1
 jade4jVersion               = 1.3.2
-jsoupVersion                = 1.13.1
-jgitVersion                 = 5.10.0.202012080955-r
-logbackVersion              = 1.2.3
-orientDbVersion             = 3.0.37
-pebbleVersion               = 3.1.5
-slf4jVersion                = 1.7.30
-thymeleafVersion            = 3.0.12.RELEASE
+jsoupVersion                = 1.21.2
+jgitVersion                 = 7.4.0.202509020913-r
+logbackVersion              = 1.5.21
+orientDbVersion             = 3.1.20
+pebbleVersion               = 3.2.4
+slf4jVersion                = 2.0.17
+snakeYamlVersion            = 2.5
+thymeleafVersion            = 3.1.3.RELEASE
+picocli                     = 4.7.7
+
 
 # testing dependencies
 junit4Version               = 4.13.2
-junit5Version               = 5.7.1
-junitPioneer                = 1.3.8
-assertjCoreVersion          = 3.19.0
-mockitoVersion              = 3.8.0
+junit5Version               = 5.14.1
+junitPioneer                = 2.3.0
+assertjCoreVersion          = 3.27.6
+mockitoVersion              = 5.20.0
 
 # build dependencies
-jacocoVersion               = 0.8.6
-grgitVersion                = 1.6.0
+jacocoVersion               = 0.8.13
+nexusPublishPluginVersion   = 2.0.0
+versionsPluginVersion       = 0.53.0
+optionalBaseVersion         = 10.0.1
+jreleaserVersion            = 1.21.0
+mavenPluginDevVersion       = 1.0.3
 
-bintrayDryRun = false
-bintrayOrg = jbake
-bintrayRepo = maven
-bintrayBinaryRepo = binary
+# jbake-maven-plugin dependencies
+mavenVersion                = 3.9.11
+mavenAnnotationsVersion     = 3.15.2
+sparkVersion                = 2.9.4
 
 org.gradle.caching=true
-org.gradle.parallel=true
+org.gradle.vfs.watch = true
diff --git a/gradle/application.gradle b/gradle/application.gradle
index ed28737e0..714a77f92 100644
--- a/gradle/application.gradle
+++ b/gradle/application.gradle
@@ -1,66 +1,37 @@
-import org.ajoberstar.grgit.Grgit
-
-import java.text.SimpleDateFormat
-
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath "org.ajoberstar:grgit:$grgitVersion"
-    }
+application {
+    mainClass = "org.jbake.launcher.Main"
+    applicationName = "jbake"
 }
 
-apply plugin: 'application'
-
-mainClassName = "org.jbake.launcher.Main"
-applicationName = "jbake"
-
-
-def examplesBase = "$project.buildDir/examples"
-
 def exampleRepositories = [
-    "example_project_freemarker": "git://github.com/jbake-org/jbake-example-project-freemarker.git",
-    "example_project_groovy"    : "git://github.com/jbake-org/jbake-example-project-groovy.git",
-    "example_project_thymeleaf" : "git://github.com/jbake-org/jbake-example-project-thymeleaf.git",
-    "example_project_groovy-mte": "git://github.com/jbake-org/jbake-example-project-groovy-mte.git",
-    "example_project_jade"      : "git://github.com/jbake-org/jbake-example-project-jade.git"
+    "example_project_freemarker": "https://github.com/jbake-org/jbake-example-project-freemarker.git",
+    "example_project_groovy"    : "https://github.com/jbake-org/jbake-example-project-groovy.git",
+    "example_project_thymeleaf" : "https://github.com/jbake-org/jbake-example-project-thymeleaf.git",
+    "example_project_groovy-mte": "https://github.com/jbake-org/jbake-example-project-groovy-mte.git",
+    "example_project_jade"      : "https://github.com/jbake-org/jbake-example-project-jade.git"
 ]
 
-processResources {
-    from("src/main/resources"){
-        include 'default.properties'
-        expand  jbakeVersion: project.version,
-                timestamp: new SimpleDateFormat("yyyy-MM-dd HH:mm:ssa").format( new Date() )
-    }
-}
-
-
-
 //create clone and Zip Task for each repository
 exampleRepositories.each { name, repository ->
 
-    task "clone_${name}Repository"() {
+    tasks.register("clone_${name}Repository", Exec) {
         group = "distribution"
-        description "Clone jbake ${name} example project repository"
-
-        def repositoryName = "$examplesBase/$name"
+        description = "Clone jbake ${name} example project repository"
+        def repositoryName = "${project.layout.buildDirectory.asFile.get()}/examples/$name"
 
-        outputs.dir repositoryName
+        outputs.dir(repositoryName)
 
-        doLast {
-            Grgit.clone(dir: repositoryName, uri: repository)
-        }
+        executable "git"
+        args "clone", "$repository", "$repositoryName"
     }
 
-    task "${name}Zip"(type: Zip) {
-        group "distribution"
-        description "Zip $name repository"
+    tasks.register("${name}Zip", Zip) {
+        group = "distribution"
+        description = "Zip $name repository"
 
-        archiveBaseName = name
-        archiveFileName = "${archiveBaseName.get()}.zip"
+        archiveFileName = "${name}.zip"
 
-        from project.tasks.getByName("clone_${name}Repository").outputs
+        from project.tasks.named("clone_${name}Repository").get().outputs
         exclude 'README.md'
         exclude 'LICENSE'
         exclude '.git'
diff --git a/gradle/maven-publishing.gradle b/gradle/maven-publishing.gradle
index a1a518be0..e0bb12f09 100644
--- a/gradle/maven-publishing.gradle
+++ b/gradle/maven-publishing.gradle
@@ -1,108 +1,85 @@
-import java.text.SimpleDateFormat
-
 apply plugin: 'maven-publish'
 
-Date buildTimeAndDate = new Date()
-ext {
-    buildDate = new SimpleDateFormat('yyyy-MM-dd').format(buildTimeAndDate)
-    buildTime = new SimpleDateFormat('HH:mm:ss.SSSZ').format(buildTimeAndDate)
-    isReleaseVersion = !version.endsWith("SNAPSHOT")
-}
-
-task javadocJar(type: Jar) {
-    archiveClassifier.set('javadoc')
-    from javadoc
-}
-
-task sourcesJar(type: Jar) {
-    archiveClassifier.set('sources')
-    from sourceSets.main.allSource
-}
-
 publishing {
     publications {
-            mavenJava(MavenPublication) {
-                from components.java
+        mavenJava(MavenPublication) {
+            from components.java
 
-                artifact javadocJar
-                artifact sourcesJar
+            artifact javadocJar
+            artifact sourcesJar
 
-                pom {
-                    name = "jbake"
-                    description = project.description
-                    url = project.website
-                    developers {
-                        developer {
-                            id = 'jonbullock'
-                            name = 'Jonathan Bullock'
-                            email = 'jonbullock@gmail.com'
-                            url = 'http://jonathanbullock.com'
-                            timezone = 'Europe/London'
-                        }
-                        developer {
-                            id = 'ancho'
-                            name = 'Frank Becker'
-                            email = 'frank@calmdevelopment.de'
-                            timezone = 'Europe/Berlin'
-                        }
-                        developer {
-                            id = 'manikmagar'
-                            name = 'Manik Magar'
-                            url = 'https://manik.magar.me/'
-                            timezone = 'America/New_York'
-                        }
+            pom {
+                name = "jbake"
+                description = project.description
+                url = project.website
+                developers {
+                    developer {
+                        id = 'jonbullock'
+                        name = 'Jonathan Bullock'
+                        email = 'jonbullock@gmail.com'
+                        url = 'http://jonathanbullock.com'
+                        timezone = 'Europe/London'
                     }
-                    scm {
-                        url = project.vcs
-                        connection = 'scm:git:git@github.com:jbake-org/jbake.git'
-                        developerConnection = 'scm:git:https://github.com/jbake-org/jbake.git'
+                    developer {
+                        id = 'ancho'
+                        name = 'Frank Becker'
+                        email = 'frank@calmdevelopment.de'
+                        timezone = 'Europe/Berlin'
                     }
-                    issueManagement {
-                        system = 'GitHub Issues'
-                        url = project.issues
+                    developer {
+                        id = 'manikmagar'
+                        name = 'Manik Magar'
+                        url = 'https://manik.magar.me/'
+                        timezone = 'America/New_York'
                     }
-                    mailingLists {
-
-                        mailingList {
-                            name = 'jbake-dev'
-                            subscribe = 'jbake-dev@googlegroups.com'
-                            unsubscribe = 'jbake-dev+unsubscribe@googlegroups.com'
-                            archive = 'http://groups.google.com/group/jbake-dev'
-                        }
-                        mailingList {
-                            name = 'jbake-user'
-                            subscribe = 'jbake-user@googlegroups.com'
-                            unsubscribe = 'jbake-user+unsubscribe@googlegroups.com'
-                            archive = 'http://groups.google.com/group/jbake-user'
-                        }
+                    developer {
+                        id = 'aldrinleal'
+                        name = 'Aldrin Leal'
+                        timezone = 'America/Bogota'
                     }
+                }
+                scm {
+                    url = project.vcs
+                    connection = 'scm:git:git@github.com:jbake-org/jbake.git'
+                    developerConnection = 'scm:git:https://github.com/jbake-org/jbake.git'
+                }
+                issueManagement {
+                    system = 'GitHub Issues'
+                    url = project.issues
+                }
+                mailingLists {
 
-                    licenses {
-                        license {
-                            name = 'The MIT License (MIT)'
-                            url = 'http://opensource.org/licenses/MIT'
-                        }
+                    mailingList {
+                        name = 'jbake-dev'
+                        subscribe = 'jbake-dev@googlegroups.com'
+                        unsubscribe = 'jbake-dev+unsubscribe@googlegroups.com'
+                        archive = 'http://groups.google.com/group/jbake-dev'
+                    }
+                    mailingList {
+                        name = 'jbake-user'
+                        subscribe = 'jbake-user@googlegroups.com'
+                        unsubscribe = 'jbake-user+unsubscribe@googlegroups.com'
+                        archive = 'http://groups.google.com/group/jbake-user'
                     }
                 }
             }
         }
     }
+}
 
 jar {
     manifest {
-        attributes(
-                'Built-By': System.properties['user.name'],
-                'Created-By': "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})".toString(),
-                'Build-Date': buildDate,
-                'Build-Time': buildTime,
-                'Specification-Title': project.name,
-                'Specification-Version': project.version,
-                'Specification-Vendor': project.name,
-                'Implementation-Title': project.name,
-                'Implementation-Version': project.version,
-                'Implementation-Vendor': project.name
-        )
+        attributes.putIfAbsent('Built-By', System.properties['user.name'])
+        attributes.putIfAbsent('Created-By', "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})")
+        attributes.putIfAbsent('Specification-Title', project.name)
+        attributes.putIfAbsent('Specification-Version', project.version)
+        attributes.putIfAbsent('Specification-Vendor', project.name)
+        attributes.putIfAbsent('Implementation-Title', project.name)
+        attributes.putIfAbsent('Implementation-Version', project.version)
+        attributes.putIfAbsent('Implementation-Vendor', project.name)
+    }
+    doFirst {
+        manifest.attributes.putIfAbsent('Build-Date',commitBuildAndDate.date())
+        manifest.attributes.putIfAbsent('Build-Time',commitBuildAndDate.time())
     }
 }
-
-
diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
deleted file mode 100644
index 38135d261..000000000
--- a/gradle/publishing.gradle
+++ /dev/null
@@ -1,103 +0,0 @@
-apply plugin: 'com.jfrog.bintray'
-
-ext.bintrayUsername = project.hasProperty('bintrayUsername') ? bintrayUsername : ''
-ext.bintrayKey = project.hasProperty('bintrayKey') ? bintrayKey : ''
-
-/*
-   UGLY HACK to workaround gradle-bintray-plugin compatibility with Gradle 5+
-   https://github.com/asciidoctor/asciidoctorj/issues/861
-   https://github.com/bintray/gradle-bintray-plugin/issues/300
-   WARNING: since the Groovy Gradle API is modified, this breaks build isolation when sharing a common Gradle daemon instance
-   This works because gradle-bintray-plugin is using Groovy dynamic compilation hence it is affected by Groovy runtime meta-programming
-   Tested with: Gradle 5.6.3 / gradle-bintray-plugin 1.8.4
-   TODO: remove as soon as bintray/gradle-bintray-plugin#300 is fixed and integrated
-*/
-Signature.metaClass.getToSignArtifact = { ->
-      return (delegate as Signature).source
-}
-
-if (project.name == "jbake-dist") {
-
-    /**
-     * jbake-dist specific bintray configuration.
-     *
-     * We just need the distribution packages from the project with signatures if they are present.
-     * Notice the repository. It's a generic one. You can configure it with -PbintrayBinaryRepo=whatever
-     */
-    bintray {
-        user = bintrayUsername
-        key = bintrayKey
-
-        if (!project.hasProperty('skipSigning')) {
-            filesSpec {
-                from distZip
-                from distTar
-                from signArchives.signatureFiles.filter { !it.name.endsWith(".jar.asc") }
-
-                into "."
-            }
-
-            _bintrayRecordingCopy.dependsOn signArchives
-
-        } else {
-            filesSpec {
-                from distZip
-                from distTar
-
-                into "."
-            }
-        }
-
-        dryRun = bintrayDryRun.toBoolean()
-
-        pkg {
-            userOrg = bintrayOrg
-            repo = bintrayBinaryRepo
-            name = applicationName
-            desc = project.description
-            licenses = ['MIT']
-            labels = ['jbake', 'site-generator']
-            websiteUrl = project.website
-            issueTrackerUrl = project.issues
-            vcsUrl = project.vcs
-            publicDownloadNumbers = true
-        }
-    }
-
-} else {
-
-    bintray {
-        user = bintrayUsername
-        key = bintrayKey
-        publications = ['mavenJava']
-
-        if (!project.hasProperty('skipSigning')) {
-            filesSpec {
-                from("${buildDir}/libs") {
-                    include '*.jar.asc'
-                }
-                from("${buildDir}/publications/mavenJava") {
-                    include 'pom-default.xml.asc'
-                    rename 'pom-default.xml.asc', "${project.name}-${project.version}.pom.asc"
-                }
-                into "."
-            }
-        }
-
-        dryRun = bintrayDryRun.toBoolean()
-        pkg {
-            userOrg = bintrayOrg
-            repo = bintrayRepo
-            name = project.name
-            desc = project.description
-            licenses = ['MIT']
-            labels = ['jbake', 'site-generator']
-            websiteUrl = project.website
-            issueTrackerUrl = project.issues
-            vcsUrl = project.vcs
-            publicDownloadNumbers = true
-        }
-    }
-
-}
-
diff --git a/gradle/release.gradle b/gradle/release.gradle
new file mode 100644
index 000000000..474481d4e
--- /dev/null
+++ b/gradle/release.gradle
@@ -0,0 +1,60 @@
+apply plugin: 'org.jreleaser'
+
+// cannot reference project. properties inside jreleaser config block
+// as that collides with the "project" DSL element of the config extension
+ext.releaseIsDryrun = (project.rootProject.findProperty('dryrun') ?: false).toBoolean()
+ext.projectWebsite = project.website
+
+jreleaser {
+    dryrun = releaseIsDryrun
+    gitRootSearch = true
+
+    project {
+        website = projectWebsite
+        authors = ['Jonathan Bullock']
+        license = 'MIT'
+        extraProperties.put('inceptionYear', '2012')
+    }
+
+    release {
+        github {
+            overwrite = true
+            branch = 'master'
+            changelog {
+                formatted = 'always'
+                format = '- {{commitShortHash}} {{commitTitle}}'
+                contributors {
+                    format = '- {{contributorName}}{{#contributorUsernameAsLink}} ({{.}}){{/contributorUsernameAsLink}}'
+                }
+                hide {
+                    contributors = ['GitHub']
+                }
+            }
+        }
+    }
+
+    signing {
+        active = 'always'
+        armored = true
+    }
+
+    checksum {
+        individual = true
+    }
+
+    distributions {
+        jbake {
+            sdkman {
+                active = 'release'
+            }
+            artifact {
+                path = 'build/distributions/{{distributionName}}-{{projectVersion}}-bin.zip'
+                transform = '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}-bin.zip'
+            }
+            artifact {
+                path = 'build/distributions/{{distributionName}}-{{projectVersion}}.tar'
+                transform = '{{distributionName}}/{{distributionName}}-{{projectEffectiveVersion}}.tar'
+            }
+        }
+    }
+}
diff --git a/gradle/sdkman.gradle b/gradle/sdkman.gradle
deleted file mode 100644
index 54d72c756..000000000
--- a/gradle/sdkman.gradle
+++ /dev/null
@@ -1,34 +0,0 @@
-apply plugin: "io.sdkman.vendors"
-
-ext.sdkman_consumer_key = project.hasProperty('sdkman_consumer_key')?sdkman_consumer_key:''
-ext.sdkman_consumer_token = project.hasProperty('sdkman_consumer_token')?sdkman_consumer_token:''
-
-sdkman {
-    consumerKey = project.sdkman_consumer_key
-    consumerToken = project.sdkman_consumer_token
-    candidate = "jbake"
-    version = rootProject.version
-    hashtag = "#JBake"
-    url = "https://dl.bintray.com/jbake/binary/${distZip.archiveName}"
-}
-
-task distributionAvailable() {
-    group = "Verification"
-    description = "Check if distribution is available on bintray"
-
-    doLast {
-        String errorMsg = "Distribution is not available at $sdkman.url"
-
-        HttpURLConnection connection = sdkman.url.toURL().openConnection()
-        connection.setRequestMethod("HEAD")
-        connection.connect()
-
-        if ( connection.responseCode != 200 ){
-            throw new GradleException(errorMsg)
-        }
-    }
-}
-
-tasks.findAll{ it.name ==~ /sdk.*(Release|Version)/ }.each {
-    it.dependsOn distributionAvailable
-}
\ No newline at end of file
diff --git a/gradle/signing.gradle b/gradle/signing.gradle
index 72cc887bb..a8b0abece 100644
--- a/gradle/signing.gradle
+++ b/gradle/signing.gradle
@@ -11,10 +11,5 @@ if ( !project.hasProperty('skipSigning') ) {
                 sign publishing.publications.mavenJava
             }
         }
-        else {
-            signing {
-                sign configurations.archives
-            }
-        }
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c02..8bdaf60c7 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 442d9132e..bad7c2462 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0c8..ef07e0162 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,81 +15,115 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,88 +132,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 107acd32c..5eed7ee84 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,89 +1,94 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/jbake-core/build.gradle b/jbake-core/build.gradle
index d7f886ee7..789e84417 100644
--- a/jbake-core/build.gradle
+++ b/jbake-core/build.gradle
@@ -1,42 +1,64 @@
-import java.text.SimpleDateFormat
-
-apply from: "$rootDir/gradle/sonarqube.gradle"
-apply plugin: 'java-library'
+plugins {
+    id "org.jbake.convention.java-common"
+    id 'java-library'
+}
 
+apply from: "$rootDir/gradle/maven-publishing.gradle"
+apply from: "$rootDir/gradle/signing.gradle"
 
 description = "The core library of JBake"
 
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            pom {
+                name = "jbake-core"
+
+                licenses {
+                    license {
+                        name = 'The MIT License (MIT)'
+                        url = 'http://opensource.org/licenses/MIT'
+                    }
+                }
+            }
+        }
+    }
+}
+
+
 dependencies {
-    implementation "commons-io:commons-io:$commonsIoVersion"
-    implementation "commons-configuration:commons-configuration:$commonsConfigurationVersion"
-    implementation "org.apache.commons:commons-vfs2:$commonsVfs2Version", optional
+    api "commons-io:commons-io:$commonsIoVersion"
+    api "org.apache.commons:commons-configuration2:$commonsConfigurationVersion"
+    implementation "commons-beanutils:commons-beanutils:$commonsBeanutilsVersion"
+    implementation "org.apache.commons:commons-vfs2:$commonsVfs2Version"
     implementation "org.apache.commons:commons-lang3:$commonsLangVersion"
     implementation("com.googlecode.json-simple:json-simple:$jsonSimpleVersion") {
         exclude group: "junit", module: "junit"
     }
     implementation "com.orientechnologies:orientdb-core:$orientDbVersion"
-    implementation "org.asciidoctor:asciidoctorj:$asciidoctorjVersion", optional
-    implementation "org.codehaus.groovy:groovy:$groovyVersion", optional
-    implementation "org.codehaus.groovy:groovy-templates:$groovyVersion", optional
-    implementation "org.codehaus.groovy:groovy-dateutil:$groovyVersion", optional
-    implementation "org.freemarker:freemarker:$freemarkerVersion", optional
-    implementation "org.thymeleaf:thymeleaf:$thymeleafVersion", optional
-    implementation "de.neuland-bfi:jade4j:$jade4jVersion", optional
-    implementation "com.vladsch.flexmark:flexmark:$flexmarkVersion", optional
-    implementation "com.vladsch.flexmark:flexmark-profile-pegdown:$flexmarkVersion", optional
+    api "org.asciidoctor:asciidoctorj:$asciidoctorjVersion"
+    api "org.codehaus.groovy:groovy:$groovyVersion"
+    api "org.codehaus.groovy:groovy-templates:$groovyVersion"
+    api "org.codehaus.groovy:groovy-dateutil:$groovyVersion"
+    api "org.freemarker:freemarker:$freemarkerVersion"
+    api "org.thymeleaf:thymeleaf:$thymeleafVersion"
+    api "de.neuland-bfi:jade4j:$jade4jVersion"
+    api "com.vladsch.flexmark:flexmark:$flexmarkVersion"
+    api "com.vladsch.flexmark:flexmark-profile-pegdown:$flexmarkVersion"
+    api "io.pebbletemplates:pebble:$pebbleVersion"
     implementation "org.jsoup:jsoup:$jsoupVersion"
-    implementation "io.pebbletemplates:pebble:$pebbleVersion", optional
+    implementation "org.yaml:snakeyaml:$snakeYamlVersion"
 
     // cli specific dependencies
-    implementation "org.eclipse.jetty:jetty-server:$jettyServerVersion", optional
-    implementation "args4j:args4j:$args4jVersion", optional
+    implementation "org.eclipse.jetty:jetty-server:$jettyServerVersion"
+    implementation "info.picocli:picocli:$picocli"
 }
 
 processResources {
-    from("src/main/resources") {
-        include 'default.properties'
-        expand jbakeVersion: project.version,
-                timestamp: new SimpleDateFormat("yyyy-MM-dd HH:mm:ssa").format(new Date())
-    }
+    inputs.property("jbake.version", project.version)
+        filesMatching("default.properties") {
+            expand jbakeVersion: inputs.properties.get("jbake.version"),
+                timestamp: () -> commitBuildAndDate.date(),
+                gitHash: () -> commitHash.abbreviated()
+        }
 }
-
diff --git a/jbake-core/src/main/java/org/jbake/app/Asset.java b/jbake-core/src/main/java/org/jbake/app/Asset.java
index cd9148cc0..7eefa962f 100644
--- a/jbake-core/src/main/java/org/jbake/app/Asset.java
+++ b/jbake-core/src/main/java/org/jbake/app/Asset.java
@@ -1,6 +1,6 @@
 package org.jbake.app;
 
-import org.apache.commons.configuration.CompositeConfiguration;
+import org.apache.commons.configuration2.CompositeConfiguration;
 import org.apache.commons.io.FileUtils;
 import org.jbake.app.configuration.JBakeConfiguration;
 import org.jbake.app.configuration.JBakeConfigurationFactory;
@@ -24,7 +24,7 @@ public class Asset {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(Asset.class);
     private final List<Throwable> errors = new LinkedList<>();
-    private JBakeConfiguration config;
+    private final JBakeConfiguration config;
 
     /**
      * @param source      Source file for the asset
@@ -65,7 +65,7 @@ public void copy(File path) {
         FileFilter filter = new FileFilter() {
             @Override
             public boolean accept(File file) {
-                return (!config.getAssetIgnoreHidden() || !file.isHidden()) && (file.isFile() || FileUtil.directoryOnlyIfNotIgnored(file));
+                return (!config.getAssetIgnoreHidden() || !file.isHidden()) && (file.isFile() || FileUtil.directoryOnlyIfNotIgnored(file, config));
             }
         };
         copy(path, config.getDestinationFolder(), filter);
@@ -99,11 +99,11 @@ public boolean isAssetFile(File path) {
         boolean isAsset = false;
 
         try {
-            if(FileUtil.directoryOnlyIfNotIgnored(path.getParentFile())) {
+            if(FileUtil.directoryOnlyIfNotIgnored(path.getParentFile(), config)) {
                 if (FileUtil.isFileInDirectory(path, config.getAssetFolder())) {
                     isAsset = true;
                 } else if (FileUtil.isFileInDirectory(path, config.getContentFolder())
-                    && FileUtil.getNotContentFileFilter().accept(path)) {
+                    && FileUtil.getNotContentFileFilter(config).accept(path)) {
                     isAsset = true;
                 }
             }
@@ -119,7 +119,7 @@ public boolean isAssetFile(File path) {
      * @param path of the content directory
      */
     public void copyAssetsFromContent(File path) {
-        copy(path, config.getDestinationFolder(), FileUtil.getNotContentFileFilter());
+        copy(path, config.getDestinationFolder(), FileUtil.getNotContentFileFilter(config));
     }
 
     /**
@@ -158,7 +158,7 @@ private void copyFile(File asset, File targetFolder) {
         try {
             FileUtils.copyFile(asset, targetFolder);
             LOGGER.info("Copying [{}]... done!", asset.getPath());
-        } catch (IOException e) {
+        } catch (IOException|IllegalArgumentException e) {
             LOGGER.error("Copying [{}]... failed!", asset.getPath(), e);
             errors.add(e);
         }
diff --git a/jbake-core/src/main/java/org/jbake/app/ContentStore.java b/jbake-core/src/main/java/org/jbake/app/ContentStore.java
index 7ebce3433..352e97ae5 100644
--- a/jbake-core/src/main/java/org/jbake/app/ContentStore.java
+++ b/jbake-core/src/main/java/org/jbake/app/ContentStore.java
@@ -32,44 +32,40 @@
 import com.orientechnologies.orient.core.metadata.schema.OClass;
 import com.orientechnologies.orient.core.metadata.schema.OSchema;
 import com.orientechnologies.orient.core.metadata.schema.OType;
-import com.orientechnologies.orient.core.record.impl.ODocument;
-import com.orientechnologies.orient.core.sql.OCommandSQL;
+import com.orientechnologies.orient.core.record.OElement;
 import com.orientechnologies.orient.core.sql.executor.OResultSet;
-import com.orientechnologies.orient.core.sql.query.OSQLSynchQuery;
-import org.jbake.model.DocumentAttributes;
+import org.jbake.model.DocumentModel;
 import org.jbake.model.DocumentTypes;
+import org.jbake.model.ModelAttributes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
-
 /**
  * @author jdlee
  */
 public class ContentStore {
 
-    private static final String STATEMENT_GET_PUBLISHED_POST_BY_TYPE_AND_TAG = "select * from %s where status='published' and ? in tags order by date desc";
-    private static final String STATEMENT_GET_POST_BY_TYPE_AND_URI = "select * from %s where sourceuri=?";
-    private static final String STATEMENT_GET_DOCUMENT_STATUS_BY_DOCTYPE_AND_URI = "select sha1,rendered from %s where sourceuri=?";
-    private static final String STATEMENT_GET_PUBLISHED_COUNT = "select count(*) as count from %s where status='published'";
-    private static final String STATEMENT_MARK_CONTENT_AS_RENDERD = "update %s set rendered=true where rendered=false and cached=true";
-    private static final String STATEMENT_DELETE_DOCTYPE_BY_SOURCEURI = "delete from %s where sourceuri=?";
-    private static final String STATEMENT_GET_UNDRENDERED_CONTENT = "select * from %s where rendered=false order by date desc";
+    private static final String STATEMENT_GET_PUBLISHED_POST_BY_TYPE_AND_TAG = "select * from Documents where status='published' and type='%s' and ? in tags order by date desc";
+    private static final String STATEMENT_GET_DOCUMENT_STATUS_BY_DOCTYPE_AND_URI = "select sha1,rendered from Documents where sourceuri=?";
+    private static final String STATEMENT_GET_PUBLISHED_COUNT = "select count(*) as count from Documents where status='published' and type='%s'";
+    private static final String STATEMENT_MARK_CONTENT_AS_RENDERD = "update Documents set rendered=true where rendered=false and type='%s' and sourceuri='%s' and cached=true";
+    private static final String STATEMENT_DELETE_DOCTYPE_BY_SOURCEURI = "delete from Documents where sourceuri=?";
+    private static final String STATEMENT_GET_UNDRENDERED_CONTENT = "select * from Documents where rendered=false order by date desc";
     private static final String STATEMENT_GET_SIGNATURE_FOR_TEMPLATES = "select sha1 from Signatures where key='templates'";
-    private static final String STATEMENT_GET_TAGS_FROM_PUBLISHED_POSTS = "select tags from post where status='published'";
-    private static final String STATEMENT_GET_ALL_CONTENT_BY_DOCTYPE = "select * from %s order by date desc";
-    private static final String STATEMENT_GET_PUBLISHED_CONTENT_BY_DOCTYPE = "select * from %s where status='published' order by date desc";
-    private static final String STATEMENT_GET_PUBLISHED_POSTS_BY_TAG = "select * from post where status='published' and ? in tags order by date desc";
-    private static final String STATEMENT_GET_TAGS_BY_DOCTYPE = "select tags from %s where status='published'";
+    private static final String STATEMENT_GET_TAGS_FROM_PUBLISHED_POSTS = "select tags from Documents where status='published' and type='post'";
+    private static final String STATEMENT_GET_ALL_CONTENT_BY_DOCTYPE = "select * from Documents where type='%s' order by date desc";
+    private static final String STATEMENT_GET_PUBLISHED_CONTENT_BY_DOCTYPE = "select * from Documents where status='published' and type='%s' order by date desc";
+    private static final String STATEMENT_GET_PUBLISHED_POSTS_BY_TAG = "select * from Documents where status='published' and type='post' and ? in tags order by date desc";
+    private static final String STATEMENT_GET_TAGS_BY_DOCTYPE = "select tags from Documents where status='published' and type='%s'";
     private static final String STATEMENT_INSERT_TEMPLATES_SIGNATURE = "insert into Signatures(key,sha1) values('templates',?)";
-    private static final String STATEMENT_DELETE_ALL = "delete from %s";
+    private static final String STATEMENT_DELETE_ALL = "delete from Documents where type='%s'";
     private static final String STATEMENT_UPDATE_TEMPLATE_SIGNATURE = "update Signatures set sha1=? where key='templates'";
+    private static final String STATEMENT_GET_DOCUMENT_COUNT_BY_TYPE = "select count(*) as count from Documents where type='%s'";
 
     private final Logger logger = LoggerFactory.getLogger(ContentStore.class);
     private final String type;
@@ -130,12 +126,10 @@ public final void updateSchema() {
 
         OSchema schema = db.getMetadata().getSchema();
 
-        for (String docType : DocumentTypes.getDocumentTypes()) {
-            if (!schema.existsClass(docType)) {
-                createDocType(schema, docType);
-            }
+        if (!schema.existsClass(Schema.DOCUMENTS)) {
+            createDocType(schema);
         }
-        if (!schema.existsClass("Signatures")) {
+        if (!schema.existsClass(Schema.SIGNATURES)) {
             createSignatureType(schema);
         }
     }
@@ -186,109 +180,70 @@ private void activateOnCurrentThread() {
         }
     }
 
-
-    /**
-     * Get a document by sourceUri and update it from the given map.
-     * @param incomingDocMap The document's db columns.
-     * @return The saved document.
-     * @throws IllegalArgumentException if sourceUri or docType are null, or if the document doesn't exist.
-     */
-    public ODocument mergeDocument(Map<String, ? extends Object> incomingDocMap) {
-        String sourceUri = (String) incomingDocMap.get(DocumentAttributes.SOURCE_URI.toString());
-
-        if (null == sourceUri) {
-            throw new IllegalArgumentException("Document sourceUri is null.");
-        }
-
-        String docType = (String) incomingDocMap.get(Crawler.Attributes.TYPE);
-
-        if (null == docType) {
-            throw new IllegalArgumentException("Document docType is null.");
-        }
-
-        // Get a document by sourceUri
-        String sql = String.format(STATEMENT_GET_POST_BY_TYPE_AND_URI, quoteIdentifier(docType));
-        activateOnCurrentThread();
-        List<ODocument> results = db.command(new OSQLSynchQuery<ODocument>(sql)).execute(sourceUri);
-        if (results.isEmpty()) {
-            throw new JBakeException("No document with sourceUri '" + sourceUri + "'.");
-        }
-
-        // Update it from the given map.
-        ODocument incomingDoc = new ODocument(docType);
-        incomingDoc.fromMap(incomingDocMap);
-        ODocument merged = results.get(0).merge(incomingDoc, true, false);
-        return merged;
-    }
-
-
     public long getDocumentCount(String docType) {
         activateOnCurrentThread();
-        return db.countClass(docType);
+        String statement = String.format(STATEMENT_GET_DOCUMENT_COUNT_BY_TYPE, docType);
+        return (long) query(statement).get(0).get("count");
     }
 
     public long getPublishedCount(String docType) {
-        String statement = String.format(STATEMENT_GET_PUBLISHED_COUNT, quoteIdentifier(docType));
-        return (Long) query(statement).get(0).get("count");
+        String statement = String.format(STATEMENT_GET_PUBLISHED_COUNT, docType);
+        return (long) query(statement).get(0).get("count");
     }
 
-    /*
-     * In fact, the URI should be the only input as there can only be one document at given URI; but the DB is split per document type for some reason.
-     */
-    public DocumentList getDocumentByUri(String docType, String uri) {
-        return query(String.format(STATEMENT_GET_POST_BY_TYPE_AND_URI, quoteIdentifier(docType)), uri);
+    public DocumentList<DocumentModel> getDocumentByUri(String uri) {
+        return query("select * from Documents where sourceuri=?", uri);
     }
 
-    public DocumentList getDocumentStatus(String docType, String uri) {
-        String statement = String.format(STATEMENT_GET_DOCUMENT_STATUS_BY_DOCTYPE_AND_URI, quoteIdentifier(docType));
-        return query(statement, uri);
+    public DocumentList<DocumentModel> getDocumentStatus(String uri) {
+        return query(STATEMENT_GET_DOCUMENT_STATUS_BY_DOCTYPE_AND_URI, uri);
     }
 
-    public DocumentList getPublishedPosts() {
+    public DocumentList<DocumentModel> getPublishedPosts() {
         return getPublishedContent("post");
     }
 
-    public DocumentList getPublishedPosts(boolean applyPaging) {
+    public DocumentList<DocumentModel> getPublishedPosts(boolean applyPaging) {
         return getPublishedContent("post", applyPaging);
     }
 
-    public DocumentList getPublishedPostsByTag(String tag) {
+    public DocumentList<DocumentModel> getPublishedPostsByTag(String tag) {
         return query(STATEMENT_GET_PUBLISHED_POSTS_BY_TAG, tag);
     }
 
-    public DocumentList getPublishedDocumentsByTag(String tag) {
-        final DocumentList documents = new DocumentList();
+    public DocumentList<DocumentModel> getPublishedDocumentsByTag(String tag) {
+        final DocumentList<DocumentModel> documents = new DocumentList<>();
 
         for (final String docType : DocumentTypes.getDocumentTypes()) {
-            String statement = String.format(STATEMENT_GET_PUBLISHED_POST_BY_TYPE_AND_TAG, quoteIdentifier(docType));
-            DocumentList documentsByTag = query(statement, tag);
+            String statement = String.format(STATEMENT_GET_PUBLISHED_POST_BY_TYPE_AND_TAG, docType);
+            DocumentList<DocumentModel> documentsByTag = query(statement, tag);
             documents.addAll(documentsByTag);
         }
         return documents;
     }
 
-    public DocumentList getPublishedPages() {
+    public DocumentList<DocumentModel> getPublishedPages() {
         return getPublishedContent("page");
     }
 
-    public DocumentList getPublishedContent(String docType) {
+    public DocumentList<DocumentModel> getPublishedContent(String docType) {
         return getPublishedContent(docType, false);
     }
 
-    private DocumentList getPublishedContent(String docType, boolean applyPaging) {
-        String query = String.format(STATEMENT_GET_PUBLISHED_CONTENT_BY_DOCTYPE, quoteIdentifier(docType));
+    private DocumentList<DocumentModel> getPublishedContent(String docType, boolean applyPaging) {
+        String query = String.format(STATEMENT_GET_PUBLISHED_CONTENT_BY_DOCTYPE, docType);
         if (applyPaging && hasStartAndLimitBoundary()) {
             query += " SKIP " + start + " LIMIT " + limit;
         }
         return query(query);
     }
 
-    public DocumentList getAllContent(String docType) {
+    public DocumentList<DocumentModel> getAllContent(String docType) {
         return getAllContent(docType, false);
     }
 
-    public DocumentList getAllContent(String docType, boolean applyPaging) {
-        String query = String.format(STATEMENT_GET_ALL_CONTENT_BY_DOCTYPE, quoteIdentifier(docType));
+    public DocumentList<DocumentModel> getAllContent(String docType, boolean applyPaging) {
+        String query = String.format(STATEMENT_GET_ALL_CONTENT_BY_DOCTYPE, docType);
         if (applyPaging && hasStartAndLimitBoundary()) {
             query += " SKIP " + start + " LIMIT " + limit;
         }
@@ -299,26 +254,24 @@ private boolean hasStartAndLimitBoundary() {
         return (start >= 0) && (limit > -1);
     }
 
-    private DocumentList getAllTagsFromPublishedPosts() {
+    private DocumentList<DocumentModel> getAllTagsFromPublishedPosts() {
         return query(STATEMENT_GET_TAGS_FROM_PUBLISHED_POSTS);
     }
 
-    private DocumentList getSignaturesForTemplates() {
+    private DocumentList<DocumentModel> getSignaturesForTemplates() {
         return query(STATEMENT_GET_SIGNATURE_FOR_TEMPLATES);
     }
 
-    public DocumentList getUnrenderedContent(String docType) {
-        String statement = String.format(STATEMENT_GET_UNDRENDERED_CONTENT, quoteIdentifier(docType));
-        return query(statement);
+    public DocumentList<DocumentModel> getUnrenderedContent() {
+        return query(STATEMENT_GET_UNDRENDERED_CONTENT);
     }
 
-    public void deleteContent(String docType, String uri) {
-        String statement = String.format(STATEMENT_DELETE_DOCTYPE_BY_SOURCEURI, quoteIdentifier(docType));
-        executeCommand(statement, uri);
+    public void deleteContent(String uri) {
+        executeCommand(STATEMENT_DELETE_DOCTYPE_BY_SOURCEURI, uri);
     }
 
-    public void markContentAsRendered(String docType) {
-        String statement = String.format(STATEMENT_MARK_CONTENT_AS_RENDERD, quoteIdentifier(docType));
+    public void markContentAsRendered(DocumentModel document) {
+        String statement = String.format(STATEMENT_MARK_CONTENT_AS_RENDERD, document.getType(), document.getSourceuri());
         executeCommand(statement);
     }
 
@@ -327,7 +280,7 @@ private void updateSignatures(String currentTemplatesSignature) {
     }
 
     public void deleteAllByDocType(String docType) {
-        String statement = String.format(STATEMENT_DELETE_ALL, quoteIdentifier(docType));
+        String statement = String.format(STATEMENT_DELETE_ALL, docType);
         executeCommand(statement);
     }
 
@@ -335,13 +288,13 @@ private void insertTemplatesSignature(String currentTemplatesSignature) {
         executeCommand(STATEMENT_INSERT_TEMPLATES_SIGNATURE, currentTemplatesSignature);
     }
 
-    private DocumentList query(String sql) {
+    private DocumentList<DocumentModel> query(String sql) {
         activateOnCurrentThread();
         OResultSet results = db.query(sql);
         return DocumentList.wrap(results);
     }
 
-    private DocumentList query(String sql, Object... args) {
+    private DocumentList<DocumentModel> query(String sql, Object... args) {
         activateOnCurrentThread();
         OResultSet results = db.command(sql, args);
         return DocumentList.wrap(results);
@@ -349,14 +302,14 @@ private DocumentList query(String sql, Object... args) {
 
     private void executeCommand(String query, Object... args) {
         activateOnCurrentThread();
-        db.command(new OCommandSQL(query)).execute(args);
+        db.command(query, args);
     }
 
     public Set<String> getTags() {
-        DocumentList docs = this.getAllTagsFromPublishedPosts();
+        DocumentList<DocumentModel> docs = this.getAllTagsFromPublishedPosts();
         Set<String> result = new HashSet<>();
-        for (Map<String, Object> document : docs) {
-            String[] tags = DBUtil.toStringArray(document.get(Crawler.Attributes.TAGS));
+        for (DocumentModel document : docs) {
+            String[] tags = document.getTags();
             Collections.addAll(result, tags);
         }
         return result;
@@ -365,48 +318,39 @@ public Set<String> getTags() {
     public Set<String> getAllTags() {
         Set<String> result = new HashSet<>();
         for (String docType : DocumentTypes.getDocumentTypes()) {
-            String statement = String.format(STATEMENT_GET_TAGS_BY_DOCTYPE, quoteIdentifier(docType));
-            DocumentList docs = query(statement);
-            for (Map<String, Object> document : docs) {
-                String[] tags = DBUtil.toStringArray(document.get(Crawler.Attributes.TAGS));
+            String statement = String.format(STATEMENT_GET_TAGS_BY_DOCTYPE, docType);
+            DocumentList<DocumentModel> docs = query(statement);
+            for (DocumentModel document : docs) {
+                String[] tags = document.getTags();
                 Collections.addAll(result, tags);
             }
         }
         return result;
     }
 
-    private void createDocType(final OSchema schema, final String docType) {
-        logger.debug("Create document class '{}'", docType);
-
-
-        OClass page = schema.createClass(docType);
-
-        // Primary key
-        String attribName = DocumentAttributes.SOURCE_URI.toString();
-        page.createProperty(attribName, OType.STRING).setNotNull(true);
-        page.createIndex(docType + "sourceUriIndex", OClass.INDEX_TYPE.UNIQUE, attribName);
-
-        attribName = DocumentAttributes.SHA1.toString();
-        page.createProperty(attribName, OType.STRING).setNotNull(true);
-        page.createIndex(docType + "sha1Index", OClass.INDEX_TYPE.NOTUNIQUE, attribName);
+    private void createDocType(final OSchema schema) {
+        logger.debug("Create document class");
 
-        attribName = DocumentAttributes.CACHED.toString();
-        page.createProperty(attribName, OType.BOOLEAN).setNotNull(true);
-        page.createIndex(docType + "cachedIndex", OClass.INDEX_TYPE.NOTUNIQUE, attribName);
+        OClass page = schema.createClass(Schema.DOCUMENTS);
+        page.createProperty(ModelAttributes.SHA1, OType.STRING).setNotNull(true);
+        page.createIndex(Schema.DOCUMENTS + "sha1Index", OClass.INDEX_TYPE.NOTUNIQUE, ModelAttributes.SHA1);
+        page.createProperty(ModelAttributes.SOURCE_URI, OType.STRING).setNotNull(true);
+        page.createIndex(Schema.DOCUMENTS + "sourceUriIndex", OClass.INDEX_TYPE.UNIQUE, ModelAttributes.SOURCE_URI);
+        page.createProperty(ModelAttributes.CACHED, OType.BOOLEAN).setNotNull(true);
+        page.createIndex(Schema.DOCUMENTS + "cachedIndex", OClass.INDEX_TYPE.NOTUNIQUE, ModelAttributes.CACHED);
+        page.createProperty(ModelAttributes.RENDERED, OType.BOOLEAN).setNotNull(true);
+        page.createIndex(Schema.DOCUMENTS + "renderedIndex", OClass.INDEX_TYPE.NOTUNIQUE, ModelAttributes.RENDERED);
+        page.createProperty(ModelAttributes.STATUS, OType.STRING).setNotNull(true);
+        page.createIndex(Schema.DOCUMENTS + "statusIndex", OClass.INDEX_TYPE.NOTUNIQUE, ModelAttributes.STATUS);
+        page.createProperty(ModelAttributes.TYPE, OType.STRING).setNotNull(true);
+        page.createIndex(Schema.DOCUMENTS + "typeIndex", OClass.INDEX_TYPE.NOTUNIQUE, ModelAttributes.TYPE);
 
-        attribName = DocumentAttributes.RENDERED.toString();
-        page.createProperty(attribName, OType.BOOLEAN).setNotNull(true);
-        page.createIndex(docType + "renderedIndex", OClass.INDEX_TYPE.NOTUNIQUE, attribName);
-
-        attribName = DocumentAttributes.STATUS.toString();
-        page.createProperty(attribName, OType.STRING).setNotNull(true);
-        page.createIndex(docType + "statusIndex", OClass.INDEX_TYPE.NOTUNIQUE, attribName);
     }
 
     private void createSignatureType(OSchema schema) {
-        OClass signatures = schema.createClass("Signatures");
-        signatures.createProperty(String.valueOf(DocumentAttributes.SHA1), OType.STRING).setNotNull(true);
-        signatures.createIndex("sha1Idx", OClass.INDEX_TYPE.UNIQUE, DocumentAttributes.SHA1.toString());
+        OClass signatures = schema.createClass(Schema.SIGNATURES);
+        signatures.createProperty(ModelAttributes.SHA1, OType.STRING).setNotNull(true);
+        signatures.createIndex("sha1Idx", OClass.INDEX_TYPE.UNIQUE, ModelAttributes.SHA1);
     }
 
     public void updateAndClearCacheIfNeeded(boolean needed, File templateFolder) {
@@ -426,7 +370,7 @@ public void updateAndClearCacheIfNeeded(boolean needed, File templateFolder) {
     private boolean updateTemplateSignatureIfChanged(File templateFolder) {
         boolean templateSignatureChanged = false;
 
-        DocumentList docs = this.getSignaturesForTemplates();
+        DocumentList<DocumentModel> docs = this.getSignaturesForTemplates();
         String currentTemplatesSignature;
         try {
             currentTemplatesSignature = FileUtil.sha1(templateFolder);
@@ -434,7 +378,7 @@ private boolean updateTemplateSignatureIfChanged(File templateFolder) {
             currentTemplatesSignature = "";
         }
         if (!docs.isEmpty()) {
-            String sha1 = (String) docs.get(0).get(String.valueOf(DocumentAttributes.SHA1));
+            String sha1 = docs.get(0).getSha1();
             if (!sha1.equals(currentTemplatesSignature)) {
                 this.updateSignatures(currentTemplatesSignature);
                 templateSignatureChanged = true;
@@ -461,11 +405,15 @@ public boolean isActive() {
         return db.isActiveOnCurrentThread();
     }
 
-    static String quoteIdentifier(String input) {
-        if(input == null) {
-            return input;
-        } else {
-            return "`" + input.replaceAll("([\\\\`])", "\\\\$1") + "`";
-        }
+    public void addDocument(DocumentModel document) {
+        OElement element = db.newElement(Schema.DOCUMENTS);
+        document.forEach((k, v) -> element.setProperty(k, v, OType.ANY));
+        element.save();
     }
+
+    protected abstract class Schema {
+        static final String DOCUMENTS = "Documents";
+        static final String SIGNATURES = "Signatures";
+    }
+
 }
diff --git a/jbake-core/src/main/java/org/jbake/app/Crawler.java b/jbake-core/src/main/java/org/jbake/app/Crawler.java
index 764a3e035..0c3d8b9d6 100644
--- a/jbake-core/src/main/java/org/jbake/app/Crawler.java
+++ b/jbake-core/src/main/java/org/jbake/app/Crawler.java
@@ -1,14 +1,14 @@
 package org.jbake.app;
 
 import com.orientechnologies.orient.core.record.impl.ODocument;
-import org.apache.commons.configuration.CompositeConfiguration;
+import org.apache.commons.configuration2.CompositeConfiguration;
 import org.apache.commons.io.FilenameUtils;
-import org.jbake.app.Crawler.Attributes.Status;
 import org.jbake.app.configuration.JBakeConfiguration;
 import org.jbake.app.configuration.JBakeConfigurationFactory;
-import org.jbake.model.DocumentAttributes;
+import org.jbake.model.DocumentModel;
 import org.jbake.model.DocumentStatus;
 import org.jbake.model.DocumentTypes;
+import org.jbake.model.ModelAttributes;
 import org.jbake.util.HtmlUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,10 +28,10 @@
  */
 public class Crawler {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(Crawler.class);
+    private static final Logger logger = LoggerFactory.getLogger(Crawler.class);
     private final ContentStore db;
-    private JBakeConfiguration config;
-    private Parser parser;
+    private final JBakeConfiguration config;
+    private final Parser parser;
 
     /**
      * @param db     Database instance for content
@@ -63,14 +63,24 @@ public Crawler(ContentStore db, JBakeConfiguration config) {
     public void crawl() {
         crawl(config.getContentFolder());
 
-        LOGGER.info("Content detected:");
+        logger.info("Content detected:");
         for (String docType : DocumentTypes.getDocumentTypes()) {
             long count = db.getDocumentCount(docType);
             if (count > 0) {
-                LOGGER.info("Parsed {} files of type: {}", count, docType);
+                logger.info("Parsed {} files of type: {}", count, docType);
             }
         }
+    }
+
+    public void crawlDataFiles() {
+        crawlDataFiles(config.getDataFolder());
 
+        logger.info("Data files detected:");
+        String docType = config.getDataFileDocType();
+        long count = db.getDocumentCount(docType);
+        if (count > 0) {
+            logger.info("Parsed {} files", count);
+        }
     }
 
     /**
@@ -79,7 +89,49 @@ public void crawl() {
      * @param path Folder to start from
      */
     private void crawl(File path) {
-        File[] contents = path.listFiles(FileUtil.getFileFilter());
+        File[] contents = path.listFiles(FileUtil.getFileFilter(config));
+        if (contents != null) {
+            Arrays.sort(contents);
+            for (File sourceFile : contents) {
+                if (sourceFile.isFile()) {
+                    crawlFile(sourceFile);
+                } else if (sourceFile.isDirectory()) {
+                    crawl(sourceFile);
+                }
+            }
+        }
+    }
+
+    private void crawlFile(File sourceFile) {
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("Processing [").append(sourceFile.getPath()).append("]... ");
+        String sha1 = buildHash(sourceFile);
+        String uri = buildURI(sourceFile);
+        DocumentStatus status = findDocumentStatus(uri, sha1);
+        if (status == DocumentStatus.UPDATED) {
+            sb.append(" : modified ");
+            db.deleteContent(uri);
+        } else if (status == DocumentStatus.IDENTICAL) {
+            sb.append(" : same ");
+        } else if (DocumentStatus.NEW == status) {
+            sb.append(" : new ");
+        }
+
+        logger.info("{}", sb);
+
+        if (status != DocumentStatus.IDENTICAL) {
+            processSourceFile(sourceFile, sha1, uri);
+        }
+    }
+
+    /**
+     * Crawl all files and folders looking for data files.
+     *
+     * @param path Folder to start from
+     */
+    private void crawlDataFiles(File path) {
+        File[] contents = path.listFiles(FileUtil.getDataFileFilter());
         if (contents != null) {
             Arrays.sort(contents);
             for (File sourceFile : contents) {
@@ -87,33 +139,31 @@ private void crawl(File path) {
                     StringBuilder sb = new StringBuilder();
                     sb.append("Processing [").append(sourceFile.getPath()).append("]... ");
                     String sha1 = buildHash(sourceFile);
-                    String uri = buildURI(sourceFile);
+                    String uri = buildDataFileURI(sourceFile);
                     boolean process = true;
                     DocumentStatus status = DocumentStatus.NEW;
-                    for (String docType : DocumentTypes.getDocumentTypes()) {
-                        status = findDocumentStatus(docType, uri, sha1);
-                        if (status == DocumentStatus.UPDATED) {
-                            sb.append(" : modified ");
-                            db.deleteContent(docType, uri);
-
-                        } else if (status == DocumentStatus.IDENTICAL) {
-                            sb.append(" : same ");
-                            process = false;
-                        }
-                        if (!process) {
-                            break;
-                        }
+                    String docType = config.getDataFileDocType();
+                    status = findDocumentStatus(uri, sha1);
+                    if (status == DocumentStatus.UPDATED) {
+                        sb.append(" : modified ");
+                        db.deleteContent(uri);
+                    } else if (status == DocumentStatus.IDENTICAL) {
+                        sb.append(" : same ");
+                        process = false;
+                    }
+                    if (!process) {
+                        break;
                     }
                     if (DocumentStatus.NEW == status) {
                         sb.append(" : new ");
                     }
                     if (process) { // new or updated
-                        crawlSourceFile(sourceFile, sha1, uri);
+                        crawlDataFile(sourceFile, sha1, uri, docType);
                     }
-                    LOGGER.info("{}", sb);
+                    logger.info("{}", sb);
                 }
                 if (sourceFile.isDirectory()) {
-                    crawl(sourceFile);
+                    crawlDataFiles(sourceFile);
                 }
             }
         }
@@ -124,7 +174,7 @@ private String buildHash(final File sourceFile) {
         try {
             sha1 = FileUtil.sha1(sourceFile);
         } catch (Exception e) {
-            LOGGER.error("unable to build sha1 hash for source file '{}'", sourceFile);
+            logger.error("unable to build sha1 hash for source file '{}'", sourceFile);
             sha1 = "";
         }
         return sha1;
@@ -142,12 +192,21 @@ private String buildURI(final File sourceFile) {
 
         // strip off leading / to enable generating non-root based sites
         if (uri.startsWith(FileUtil.URI_SEPARATOR_CHAR)) {
-            uri = uri.substring(1, uri.length());
+            uri = uri.substring(1);
         }
 
         return uri;
     }
 
+    private String buildDataFileURI(final File sourceFile) {
+        String uri = FileUtil.asPath(sourceFile).replace(FileUtil.asPath(config.getDataFolder()), "");
+        // strip off leading /
+        if (uri.startsWith(FileUtil.URI_SEPARATOR_CHAR)) {
+            uri = uri.substring(1, uri.length());
+        }
+        return uri;
+    }
+
     // TODO: Refactor - parametrize the following two methods into one.
     // commons-codec's URLCodec could be used when we add that dependency.
     private String createUri(String uri) {
@@ -184,50 +243,63 @@ private boolean useNoExtensionUri(String uri) {
             && uri.startsWith(noExtensionUriPrefix);
     }
 
-    private void crawlSourceFile(final File sourceFile, final String sha1, final String uri) {
+    private void crawlDataFile(final File sourceFile, final String sha1, final String uri, final String documentType) {
         try {
-            Map<String, Object> fileContents = parser.processFile(sourceFile);
-            if (fileContents != null) {
-                fileContents.put(Attributes.ROOTPATH, getPathToRoot(sourceFile));
-                fileContents.put(String.valueOf(DocumentAttributes.SHA1), sha1);
-                fileContents.put(String.valueOf(DocumentAttributes.RENDERED), false);
-                if (fileContents.get(Attributes.TAGS) != null) {
-                    // store them as a String[]
-                    String[] tags = (String[]) fileContents.get(Attributes.TAGS);
-                    fileContents.put(Attributes.TAGS, tags);
-                }
-                fileContents.put(Attributes.FILE, sourceFile.getPath());
-                fileContents.put(String.valueOf(DocumentAttributes.SOURCE_URI), uri);
-                fileContents.put(Attributes.URI, uri);
-
-                String documentType = (String) fileContents.get(Attributes.TYPE);
-                if (fileContents.get(Attributes.STATUS).equals(Status.PUBLISHED_DATE)) {
-                    if (fileContents.get(Attributes.DATE) != null && (fileContents.get(Attributes.DATE) instanceof Date)) {
-                        if (new Date().after((Date) fileContents.get(Attributes.DATE))) {
-                            fileContents.put(Attributes.STATUS, Status.PUBLISHED);
-                        }
-                    }
-                }
+            DocumentModel document = parser.processFile(sourceFile);
+            if (document != null) {
+                document.setSha1(sha1);
+                document.setRendered(true);
+                document.setFile(sourceFile.getPath());
+                document.setSourceUri(uri);
+                document.setType(documentType);
+
+                db.addDocument(document);
+            } else {
+                logger.warn("{} couldn't be parsed so it has been ignored!", sourceFile);
+            }
+        } catch (Exception ex) {
+            throw new RuntimeException("Failed crawling file: " + sourceFile.getPath() + " " + ex.getMessage(), ex);
+        }
+    }
 
-                if (config.getUriWithoutExtension()) {
-                    fileContents.put(Attributes.NO_EXTENSION_URI, uri.replace("/index.html", "/"));
-                }
+    private void processSourceFile(final File sourceFile, final String sha1, final String uri) {
+        DocumentModel document = parser.processFile(sourceFile);
+
+        if (document != null) {
+            if (DocumentTypes.contains(document.getType())) {
+                addAdditionalDocumentAttributes(document, sourceFile, sha1, uri);
 
                 if (config.getImgPathUpdate()) {
                     // Prevent image source url's from breaking
-                    HtmlUtil.fixImageSourceUrls(fileContents, config);
+                    HtmlUtil.fixImageSourceUrls(document, config);
                 }
 
-                ODocument doc = new ODocument(documentType);
-                doc.fromMap(fileContents);
-                boolean cached = fileContents.get(String.valueOf(DocumentAttributes.CACHED)) != null ? Boolean.valueOf((String) fileContents.get(String.valueOf(DocumentAttributes.CACHED))) : true;
-                doc.field(String.valueOf(DocumentAttributes.CACHED), cached);
-                doc.save();
+                db.addDocument(document);
             } else {
-                LOGGER.warn("{} has an invalid header, it has been ignored!", sourceFile);
+                logger.warn("{} has an unknown document type '{}' and has been ignored!", sourceFile, document.getType());
             }
-        } catch (Exception ex) {
-            throw new RuntimeException("Failed crawling file: " + sourceFile.getPath() + " " + ex.getMessage(), ex);
+        } else {
+            logger.warn("{} has an invalid header, it has been ignored!", sourceFile);
+        }
+    }
+
+    private void addAdditionalDocumentAttributes(DocumentModel document, File sourceFile, String sha1, String uri) {
+        document.setRootPath(getPathToRoot(sourceFile));
+        document.setSha1(sha1);
+        document.setRendered(false);
+        document.setFile(sourceFile.getPath());
+        document.setSourceUri(uri);
+        document.setUri(uri);
+        document.setCached(true);
+
+        if (document.getStatus().equals(ModelAttributes.Status.PUBLISHED_DATE)
+                && (document.getDate() != null)
+                && new Date().after(document.getDate())) {
+            document.setStatus(ModelAttributes.Status.PUBLISHED);
+        }
+
+        if (config.getUriWithoutExtension()) {
+            document.setNoExtensionUri(uri.replace("/index.html", "/"));
         }
     }
 
@@ -235,12 +307,12 @@ private String getPathToRoot(File sourceFile) {
         return FileUtil.getUriPathToContentRoot(config, sourceFile);
     }
 
-    private DocumentStatus findDocumentStatus(String docType, String uri, String sha1) {
-        DocumentList match = db.getDocumentStatus(docType, uri);
+    private DocumentStatus findDocumentStatus(String uri, String sha1) {
+        DocumentList<DocumentModel> match = db.getDocumentStatus(uri);
         if (!match.isEmpty()) {
-            Map entries = match.get(0);
-            String oldHash = (String) entries.get(String.valueOf(DocumentAttributes.SHA1));
-            if (!(oldHash.equals(sha1)) || Boolean.FALSE.equals(entries.get(String.valueOf(DocumentAttributes.RENDERED)))) {
+            DocumentModel document = match.get(0);
+            String oldHash = document.getSha1();
+            if (!oldHash.equals(sha1) || !document.getRendered()) {
                 return DocumentStatus.UPDATED;
             } else {
                 return DocumentStatus.IDENTICAL;
@@ -250,40 +322,4 @@ private DocumentStatus findDocumentStatus(String docType, String uri, String sha
         }
     }
 
-    public abstract static class Attributes {
-
-        public static final String DATE = "date";
-        public static final String STATUS = "status";
-        public static final String TYPE = "type";
-        public static final String TITLE = "title";
-        public static final String URI = "uri";
-        public static final String FILE = "file";
-        public static final String TAGS = "tags";
-        public static final String TAG = "tag";
-        public static final String ROOTPATH = "rootpath";
-        public static final String ID = "id";
-        public static final String NO_EXTENSION_URI = "noExtensionUri";
-        public static final String ALLTAGS = "alltags";
-        public static final String PUBLISHED_DATE = "published_date";
-        public static final String BODY = "body";
-        public static final String DB = "db";
-
-        private Attributes() {
-        }
-
-        /**
-         * Possible values of the {@link Attributes#STATUS} property
-         *
-         * @author ndx
-         */
-        public abstract static class Status {
-            public static final String PUBLISHED_DATE = "published-date";
-            public static final String PUBLISHED = "published";
-            public static final String DRAFT = "draft";
-
-            private Status() {
-            }
-        }
-
-    }
 }
diff --git a/jbake-core/src/main/java/org/jbake/app/DBUtil.java b/jbake-core/src/main/java/org/jbake/app/DBUtil.java
index 20355e4d3..33568b450 100644
--- a/jbake-core/src/main/java/org/jbake/app/DBUtil.java
+++ b/jbake-core/src/main/java/org/jbake/app/DBUtil.java
@@ -4,10 +4,9 @@
 import com.orientechnologies.orient.core.record.OElement;
 import com.orientechnologies.orient.core.sql.executor.OResult;
 import org.jbake.app.configuration.JBakeConfiguration;
+import org.jbake.model.DocumentModel;
 
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.ArrayList;
 
 public class DBUtil {
     private static ContentStore contentStore;
@@ -37,12 +36,11 @@ public static void closeDataStore() {
         contentStore = null;
     }
 
-    public static Map<String, Object> documentToModel(OResult doc) {
-        Map<String, Object> result = new HashMap<>();
-        Iterator<String> fieldIterator = doc.getPropertyNames().iterator();
-        while (fieldIterator.hasNext()) {
-            String entry = fieldIterator.next();
-            result.put(entry, doc.getProperty(entry));
+    public static DocumentModel documentToModel(OResult doc) {
+        DocumentModel result = new DocumentModel();
+
+        for (String key : doc.getPropertyNames()) {
+            result.put(key, doc.getProperty(key));
         }
         return result;
     }
@@ -60,6 +58,9 @@ public static String[] toStringArray(Object entry) {
         } else if (entry instanceof OTrackedList) {
             OTrackedList<String> list = (OTrackedList<String>) entry;
             return list.toArray(new String[list.size()]);
+        } else if (entry instanceof ArrayList) {
+            ArrayList<String> list = (ArrayList<String>) entry;
+            return list.toArray(new String[list.size()]);
         }
         return new String[0];
     }
diff --git a/jbake-core/src/main/java/org/jbake/app/DocumentList.java b/jbake-core/src/main/java/org/jbake/app/DocumentList.java
index 9364db3ec..d297ff387 100644
--- a/jbake-core/src/main/java/org/jbake/app/DocumentList.java
+++ b/jbake-core/src/main/java/org/jbake/app/DocumentList.java
@@ -2,9 +2,9 @@
 
 import com.orientechnologies.orient.core.sql.executor.OResult;
 import com.orientechnologies.orient.core.sql.executor.OResultSet;
+import org.jbake.model.DocumentModel;
 
 import java.util.LinkedList;
-import java.util.Map;
 
 /**
  * Wraps an OrientDB document iterator into a model usable by
@@ -12,10 +12,10 @@
  *
  * @author Cédric Champeau
  */
-public class DocumentList extends LinkedList<Map<String, Object>> {
+public class DocumentList<T> extends LinkedList<T> {
 
-    public static DocumentList wrap(OResultSet docs) {
-        DocumentList list = new DocumentList();
+    public static DocumentList<DocumentModel> wrap(OResultSet docs) {
+        DocumentList<DocumentModel> list = new DocumentList<>();
         while (docs.hasNext()) {
             OResult next = docs.next();
             list.add(DBUtil.documentToModel(next));
diff --git a/jbake-core/src/main/java/org/jbake/app/FileUtil.java b/jbake-core/src/main/java/org/jbake/app/FileUtil.java
index 2e1aa9e9d..c80dbf9e2 100644
--- a/jbake-core/src/main/java/org/jbake/app/FileUtil.java
+++ b/jbake-core/src/main/java/org/jbake/app/FileUtil.java
@@ -23,11 +23,32 @@ public class FileUtil {
 
     public static final String URI_SEPARATOR_CHAR = "/";
 
+    /**
+     * Filters files based on their file extension.
+     *
+     * @param config the jbake configuration
+     * @return Object for filtering files
+     */
+    public static FileFilter getFileFilter(JBakeConfiguration config) {
+        return new FileFilter() {
+
+            @Override
+            public boolean accept(File pathname) {
+                //Accept if input  is a non-hidden file with registered extension
+                //or if a non-hidden and not-ignored directory
+                return !pathname.isHidden() && (pathname.isFile()
+                    && Engines.getRecognizedExtensions().contains(fileExt(pathname))) || (directoryOnlyIfNotIgnored(pathname, config));
+            }
+        };
+    }
+
     /**
      * Filters files based on their file extension.
      *
      * @return Object for filtering files
+     * @deprecated use {@link #getFileFilter(JBakeConfiguration)} instead
      */
+    @Deprecated
     public static FileFilter getFileFilter() {
         return new FileFilter() {
 
@@ -41,11 +62,49 @@ public boolean accept(File pathname) {
         };
     }
 
+    /**
+     * Filters files based on their file extension - only find data files (i.e. files with .yaml or .yml extension)
+     *
+     * @return Object for filtering files
+     */
+    public static FileFilter getDataFileFilter() {
+        return new FileFilter() {
+
+            @Override
+            public boolean accept(File pathname) {
+                return "yaml".equalsIgnoreCase(fileExt(pathname)) || "yml".equalsIgnoreCase(fileExt(pathname));
+            }
+        };
+    }
+
     /**
      * Gets the list of files that are not content files based on their extension.
      *
+     * @param config the jbake configuration
      * @return FileFilter object
      */
+    public static FileFilter getNotContentFileFilter(JBakeConfiguration config) {
+        return new FileFilter() {
+
+            @Override
+            public boolean accept(File pathname) {
+                //Accept if input  is a non-hidden file with NOT-registered extension
+                //or if a non-hidden and not-ignored directory
+                return !pathname.isHidden() && (pathname.isFile()
+                    //extension should not be from registered content extensions
+                    && !Engines.getRecognizedExtensions().contains(fileExt(pathname)))
+                    || (directoryOnlyIfNotIgnored(pathname, config));
+            }
+        };
+    }
+
+    /**
+     * Gets the list of files that are not content files based on their extension.
+     *
+     * @return FileFilter object
+     * @deprecated use {@link #getNotContentFileFilter(JBakeConfiguration)} instead
+     */
+    @Deprecated
     public static FileFilter getNotContentFileFilter() {
         return new FileFilter() {
 
@@ -61,12 +120,37 @@ public boolean accept(File pathname) {
         };
     }
 
+    /**
+     * Ignores directory (and children) if it contains a file named in the
+     * configuration as a marker to ignore the directory.
+     *
+     * @param file the file to test
+     * @param config the jbake configuration
+     * @return true if file is directory and not ignored
+     */
+    public static boolean directoryOnlyIfNotIgnored(File file, JBakeConfiguration config) {
+        boolean accept = false;
+
+        FilenameFilter ignoreFile = new FilenameFilter() {
+            @Override
+            public boolean accept(File dir, String name) {
+                return name.equalsIgnoreCase(config.getIgnoreFileName());
+            }
+        };
+
+        accept = file.isDirectory() && (file.listFiles(ignoreFile).length == 0);
+
+        return accept;
+    }
+
     /**
      * Ignores directory (and children) if it contains a file named ".jbakeignore".
      *
-     * @param file {@link File}
-     * @return {@link Boolean} true/false
+     * @param file the file to test
+     * @return true if file is directory and not ignored
+     * @deprecated use {@link #directoryOnlyIfNotIgnored(File, JBakeConfiguration)} instead
      */
+    @Deprecated
     public static boolean directoryOnlyIfNotIgnored(File file) {
         boolean accept = false;
 
@@ -179,7 +263,7 @@ public static String asPath(File file) {
      * platform independent file.getPath()
      *
      * @param path the path to transform, or {@code null}
-     * @return The result will have alle platform path separators replaced by "/".
+     * @return The result will have all platform path separators replaced by "/".
      */
     public static String asPath(String path) {
         if (path == null) {
diff --git a/jbake-core/src/main/java/org/jbake/app/JBakeException.java b/jbake-core/src/main/java/org/jbake/app/JBakeException.java
index a3af314e4..f3e858a4a 100644
--- a/jbake-core/src/main/java/org/jbake/app/JBakeException.java
+++ b/jbake-core/src/main/java/org/jbake/app/JBakeException.java
@@ -1,5 +1,7 @@
 package org.jbake.app;
 
+import org.jbake.launcher.SystemExit;
+
 /**
  * This runtime exception is thrown by JBake API to indicate an processing
  * error.
@@ -9,18 +11,26 @@
 public class JBakeException extends RuntimeException {
     private static final long serialVersionUID = 1L;
 
+    final private SystemExit exit;
+
     /**
+     *
      * @param message
      *            The error message.
      * @param cause
      *            The causing exception or <code>null</code> if no cause
      *            available.
      */
-    public JBakeException(final String message, final Throwable cause) {
+    public JBakeException(final SystemExit exit, final String message, final Throwable cause) {
         super(message, cause);
+        this.exit = exit;
+    }
+
+    public JBakeException(final SystemExit exit, final String message) {
+        this(exit, message, null);
     }
 
-    public JBakeException(final String message) {
-        this(message, null);
+    public int getExit() {
+        return exit.getStatus();
     }
 }
diff --git a/jbake-core/src/main/java/org/jbake/app/Oven.java b/jbake-core/src/main/java/org/jbake/app/Oven.java
index 07b391491..ead7ce2cf 100644
--- a/jbake-core/src/main/java/org/jbake/app/Oven.java
+++ b/jbake-core/src/main/java/org/jbake/app/Oven.java
@@ -1,6 +1,7 @@
 package org.jbake.app;
 
-import org.apache.commons.configuration.CompositeConfiguration;
+import org.apache.commons.configuration2.CompositeConfiguration;
+import org.apache.commons.lang3.LocaleUtils;
 import org.jbake.app.configuration.DefaultJBakeConfiguration;
 import org.jbake.app.configuration.JBakeConfiguration;
 import org.jbake.app.configuration.JBakeConfigurationFactory;
@@ -18,6 +19,7 @@
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.ServiceLoader;
 
 /**
@@ -29,8 +31,8 @@ public class Oven {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(Oven.class);
 
-    private Utensils utensils;
-    private List<Throwable> errors = new LinkedList<>();
+    private final Utensils utensils;
+    private final List<Throwable> errors = new LinkedList<>();
     private int renderedCount = 0;
 
     /**
@@ -114,6 +116,16 @@ private void checkConfiguration(JBakeConfiguration configuration) {
         inspector.inspect();
     }
 
+    /**
+     * Sets the Locale for the JVM
+     *
+     */
+    private void setLocale() {
+        String localeString = getUtensils().getConfiguration().getJvmLocale();
+        Locale locale = localeString != null ? LocaleUtils.toLocale(localeString) : Locale.getDefault();
+        Locale.setDefault(locale);
+    }
+
     /**
      * Responsible for incremental baking, typically a single file at a time.
      *
@@ -139,6 +151,7 @@ public void bake() {
         JBakeConfiguration config = utensils.getConfiguration();
         Crawler crawler = utensils.getCrawler();
         Asset asset = utensils.getAsset();
+        setLocale();
 
         try {
 
@@ -152,6 +165,9 @@ public void bake() {
             // process source content
             crawler.crawl();
 
+            // process data files
+            crawler.crawlDataFiles();
+
             // render content
             renderContent();
 
@@ -187,6 +203,9 @@ private void updateDocTypesFromConfiguration() {
         for (String docType : config.getDocumentTypes()) {
             DocumentTypes.addDocumentType(docType);
         }
+
+        // needs manually setting as this isn't defined in same way as document types for content files
+        DocumentTypes.addDocumentType(config.getDataFileDocType());
     }
 
     private void resetDocumentTypesAndExtractors() {
diff --git a/jbake-core/src/main/java/org/jbake/app/Parser.java b/jbake-core/src/main/java/org/jbake/app/Parser.java
index d2da80ee9..129b01abf 100644
--- a/jbake-core/src/main/java/org/jbake/app/Parser.java
+++ b/jbake-core/src/main/java/org/jbake/app/Parser.java
@@ -1,13 +1,13 @@
 package org.jbake.app;
 
 import org.jbake.app.configuration.JBakeConfiguration;
+import org.jbake.model.DocumentModel;
 import org.jbake.parser.Engines;
 import org.jbake.parser.ParserEngine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
-import java.util.Map;
 
 /**
  * Parses a File for content.
@@ -31,13 +31,13 @@ public Parser(JBakeConfiguration config) {
     /**
      * Process the file by parsing the contents.
      *
-     * @param    file File input for parsing
-     * @return                The contents of the file
+     * @param file File input for parsing
+     * @return The contents of the file
      */
-    public Map<String, Object> processFile(File file) {
+    public DocumentModel processFile(File file) {
         ParserEngine engine = Engines.get(FileUtil.fileExt(file));
-        if (engine==null) {
-            LOGGER.error("Unable to find suitable markup engine for {}",file);
+        if (engine == null) {
+            LOGGER.error("Unable to find suitable markup engine for {}", file);
             return null;
         }
 
diff --git a/jbake-core/src/main/java/org/jbake/app/Renderer.java b/jbake-core/src/main/java/org/jbake/app/Renderer.java
index 696569ec2..5508fd327 100644
--- a/jbake-core/src/main/java/org/jbake/app/Renderer.java
+++ b/jbake-core/src/main/java/org/jbake/app/Renderer.java
@@ -1,11 +1,13 @@
 package org.jbake.app;
 
-import org.apache.commons.configuration.CompositeConfiguration;
-import org.jbake.app.Crawler.Attributes;
+import org.apache.commons.configuration2.CompositeConfiguration;
 import org.jbake.app.configuration.DefaultJBakeConfiguration;
 import org.jbake.app.configuration.JBakeConfiguration;
 import org.jbake.app.configuration.JBakeConfigurationFactory;
+import org.jbake.model.DocumentModel;
+import org.jbake.model.ModelAttributes;
 import org.jbake.template.DelegatingTemplateEngine;
+import org.jbake.template.model.TemplateModel;
 import org.jbake.util.PagingHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,10 +17,10 @@
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
+import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Render output to a file.
@@ -30,8 +32,9 @@ public class Renderer {
     private static final String SITEMAP_TEMPLATE_NAME = "sitemap";
     private static final String FEED_TEMPLATE_NAME = "feed";
     private static final String ARCHIVE_TEMPLATE_NAME = "archive";
+    private static final String ERROR404_TEMPLATE_NAME = "error404";
 
-    private final Logger LOGGER = LoggerFactory.getLogger(Renderer.class);
+    private final Logger logger = LoggerFactory.getLogger(Renderer.class);
     private final JBakeConfiguration config;
     private final DelegatingTemplateEngine renderingEngine;
     private final ContentStore db;
@@ -97,7 +100,7 @@ public Renderer(ContentStore db, JBakeConfiguration config, DelegatingTemplateEn
     }
 
     private String findTemplateName(String docType) {
-        return config.getTemplateFileByDocType(docType).getName();
+        return config.getTemplateByDocType(docType);
     }
 
     /**
@@ -106,9 +109,9 @@ private String findTemplateName(String docType) {
      * @param content The content to renderDocument
      * @throws Exception if IOException or SecurityException are raised
      */
-    public void render(Map<String, Object> content) throws Exception {
-        String docType = (String) content.get(Crawler.Attributes.TYPE);
-        String outputFilename = config.getDestinationFolder().getPath() + File.separatorChar + content.get(Attributes.URI);
+    public void render(DocumentModel content) throws Exception {
+        String docType = content.getType();
+        String outputFilename = config.getDestinationFolder().getPath() + File.separatorChar + content.getUri();
         if (outputFilename.lastIndexOf('.') > outputFilename.lastIndexOf(File.separatorChar)) {
             outputFilename = outputFilename.substring(0, outputFilename.lastIndexOf('.'));
         }
@@ -117,30 +120,30 @@ public void render(Map<String, Object> content) throws Exception {
         String outputExtension = config.getOutputExtensionByDocType(docType);
         File draftFile = new File(outputFilename, config.getDraftSuffix() + outputExtension);
         if (draftFile.exists()) {
-            draftFile.delete();
+            Files.delete(draftFile.toPath());
         }
 
         File publishedFile = new File(outputFilename + outputExtension);
         if (publishedFile.exists()) {
-            publishedFile.delete();
+            Files.delete(publishedFile.toPath());
         }
 
-        if (content.get(Crawler.Attributes.STATUS).equals(Crawler.Attributes.Status.DRAFT)) {
+        if (content.getStatus().equals(ModelAttributes.Status.DRAFT)) {
             outputFilename = outputFilename + config.getDraftSuffix();
         }
 
         File outputFile = new File(outputFilename + outputExtension);
-        Map<String, Object> model = new HashMap<String, Object>();
-        model.put("content", content);
-        model.put("renderer", renderingEngine);
+        TemplateModel model = new TemplateModel();
+        model.setContent(content);
+        model.setRenderer(renderingEngine);
 
         try {
             try (Writer out = createWriter(outputFile)) {
                 renderingEngine.renderDocument(model, findTemplateName(docType), out);
             }
-            LOGGER.info("Rendering [{}]... done!", outputFile);
+            logger.info("Rendering [{}]... done!", outputFile);
         } catch (Exception e) {
-            LOGGER.error("Rendering [{}]... failed!", outputFile, e);
+            logger.error("Rendering [{}]... failed!", outputFile, e);
             throw new Exception("Failed to render file " + outputFile.getAbsolutePath() + ". Cause: " + e.getMessage(), e);
         }
     }
@@ -160,9 +163,9 @@ private void render(RenderingConfig renderConfig) throws Exception {
             try (Writer out = createWriter(outputFile)) {
                 renderingEngine.renderDocument(renderConfig.getModel(), renderConfig.getTemplate(), out);
             }
-            LOGGER.info("Rendering {} [{}]... done!", renderConfig.getName(), outputFile);
+            logger.info("Rendering {} [{}]... done!", renderConfig.getName(), outputFile);
         } catch (Exception e) {
-            LOGGER.error("Rendering {} [{}]... failed!", renderConfig.getName(), outputFile, e);
+            logger.error("Rendering {} [{}]... failed!", renderConfig.getName(), outputFile, e);
             throw new Exception("Failed to render " + renderConfig.getName(), e);
         }
     }
@@ -174,7 +177,6 @@ private void render(RenderingConfig renderConfig) throws Exception {
      * @throws Exception if IOException or SecurityException are raised
      */
     public void renderIndex(String indexFile) throws Exception {
-
         render(new DefaultRenderingConfig(indexFile, MASTERINDEX_TEMPLATE_NAME));
     }
 
@@ -188,9 +190,9 @@ public void renderIndexPaging(String indexFile) throws Exception {
         } else {
             PagingHelper pagingHelper = new PagingHelper(totalPosts, postsPerPage);
 
-            Map<String, Object> model = new HashMap<String, Object>();
-            model.put("renderer", renderingEngine);
-            model.put("numberOfPages", pagingHelper.getNumberOfPages());
+            TemplateModel model = new TemplateModel();
+            model.setRenderer(renderingEngine);
+            model.setNumberOfPages(pagingHelper.getNumberOfPages());
 
             try {
                 db.setLimit(postsPerPage);
@@ -198,18 +200,18 @@ public void renderIndexPaging(String indexFile) throws Exception {
                     String fileName = indexFile;
 
                     db.setStart(pageStart);
-                    model.put("currentPageNumber", page);
+                    model.setCurrentPageNuber(page);
                     String previous = pagingHelper.getPreviousFileName(page);
-                    model.put("previousFileName", previous);
+                    model.setPreviousFilename(previous);
                     String nextFileName = pagingHelper.getNextFileName(page);
-                    model.put("nextFileName", nextFileName);
+                    model.setNextFileName(nextFileName);
 
-                    Map<String, Object> contentModel =  buildSimpleModel(MASTERINDEX_TEMPLATE_NAME);
+                    DocumentModel contentModel = buildSimpleModel(MASTERINDEX_TEMPLATE_NAME);
 
-                    if(page > 1){
-                        contentModel.put(Attributes.ROOTPATH, "../");
+                    if (page > 1) {
+                        contentModel.setRootPath("../");
                     }
-                    model.put("content", contentModel);
+                    model.setContent(contentModel);
 
                     // Add page number to file name
                     fileName = pagingHelper.getCurrentFileName(page, fileName);
@@ -255,6 +257,16 @@ public void renderArchive(String archiveFile) throws Exception {
         render(new DefaultRenderingConfig(archiveFile, ARCHIVE_TEMPLATE_NAME));
     }
 
+    /**
+     * Render an 404 file using the predefined template.
+     *
+     * @param errorFile      The name of the output file
+     * @throws Exception    if default rendering configuration is not loaded correctly
+     */
+    public void renderError404(String errorFile) throws Exception {
+        render(new DefaultRenderingConfig(errorFile, ERROR404_TEMPLATE_NAME));
+    }
+
     /**
      * Render tag files using the supplied content.
      *
@@ -268,16 +280,16 @@ public int renderTags(String tagPath) throws Exception {
 
         for (String tag : db.getAllTags()) {
             try {
-                Map<String, Object> model = new HashMap<>();
-                model.put("renderer", renderingEngine);
-                model.put(Attributes.TAG, tag);
-                Map<String, Object> map = buildSimpleModel(Attributes.TAG);
-                model.put("content", map);
-
+                TemplateModel model = new TemplateModel();
+                model.setRenderer(renderingEngine);
+                model.setTag(tag);
+                DocumentModel map = buildSimpleModel(ModelAttributes.TAG.toString());
                 File path = new File(config.getDestinationFolder() + File.separator + tagPath + File.separator + tag + config.getOutputExtension());
-                map.put(Attributes.ROOTPATH, FileUtil.getUriPathToDestinationRoot(config, path));
 
-                render(new ModelRenderingConfig(path, Attributes.TAG, model, findTemplateName(Attributes.TAG)));
+                map.setRootPath(FileUtil.getUriPathToDestinationRoot(config, path));
+                model.setContent(map);
+
+                render(new ModelRenderingConfig(path, ModelAttributes.TAG.toString(), model, findTemplateName(ModelAttributes.TAG.toString())));
 
                 renderedCount++;
             } catch (Exception e) {
@@ -290,13 +302,15 @@ public int renderTags(String tagPath) throws Exception {
                 // Add an index file at root folder of tags.
                 // This will prevent directory listing and also provide an option to
                 // display all tags page.
-                Map<String, Object> model = new HashMap<String, Object>();
-                model.put("renderer", renderingEngine);
-                Map<String, Object> map = buildSimpleModel(Attributes.TAGS);
-                model.put("content", map);
-
+                TemplateModel model = new TemplateModel();
+                model.setRenderer(renderingEngine);
+                DocumentModel map = buildSimpleModel(ModelAttributes.TAGS.toString());
                 File path = new File(config.getDestinationFolder() + File.separator + tagPath + File.separator + "index" + config.getOutputExtension());
-                map.put(Attributes.ROOTPATH, FileUtil.getUriPathToDestinationRoot(config, path));
+
+                map.setRootPath(FileUtil.getUriPathToDestinationRoot(config, path));
+                model.setContent(map);
+
+
                 render(new ModelRenderingConfig(path, "tagindex", model, findTemplateName("tagsindex")));
                 renderedCount++;
             } catch (Exception e) {
@@ -320,12 +334,12 @@ public int renderTags(String tagPath) throws Exception {
      * Builds simple map of values, which are exposed when rendering index/archive/sitemap/feed/tags.
      *
      * @param type
-     * @return
+     * @return a basic {@link DocumentModel}
      */
-    private Map<String, Object> buildSimpleModel(String type) {
-        Map<String, Object> content = new HashMap<String, Object>();
-        content.put(Attributes.TYPE, type);
-        content.put(Attributes.ROOTPATH, "");
+    private DocumentModel buildSimpleModel(String type) {
+        DocumentModel content = new DocumentModel();
+        content.setType(type);
+        content.setRootPath("");
         // add any more keys here that need to have a default value to prevent need to perform null check in templates
         return content;
     }
@@ -338,10 +352,10 @@ private interface RenderingConfig {
 
         String getTemplate();
 
-        Map<String, Object> getModel();
+        TemplateModel getModel();
     }
 
-    private static abstract class AbstractRenderingConfig implements RenderingConfig {
+    private abstract static class AbstractRenderingConfig implements RenderingConfig {
 
         protected final File path;
         protected final String name;
@@ -372,27 +386,27 @@ public String getTemplate() {
     }
 
     public class ModelRenderingConfig extends AbstractRenderingConfig {
-        private final Map<String, Object> model;
+        private final TemplateModel model;
 
-        public ModelRenderingConfig(String fileName, Map<String, Object> model, String templateType) {
+        public ModelRenderingConfig(String fileName, TemplateModel model, String templateType) {
             super(new File(config.getDestinationFolder(), fileName), fileName, findTemplateName(templateType));
             this.model = model;
         }
 
-        public ModelRenderingConfig(File path, String name, Map<String, Object> model, String template) {
+        public ModelRenderingConfig(File path, String name, TemplateModel model, String template) {
             super(path, name, template);
             this.model = model;
         }
 
         @Override
-        public Map<String, Object> getModel() {
+        public TemplateModel getModel() {
             return model;
         }
     }
 
     class DefaultRenderingConfig extends AbstractRenderingConfig {
 
-        private final Object content;
+        private final DocumentModel content;
 
         private DefaultRenderingConfig(File path, String allInOneName) {
             super(path, allInOneName, findTemplateName(allInOneName));
@@ -415,16 +429,16 @@ public DefaultRenderingConfig(String allInOneName) {
         }
 
         @Override
-        public Map<String, Object> getModel() {
-            Map<String, Object> model = new HashMap<String, Object>();
-            model.put("renderer", renderingEngine);
-            model.put("content", content);
+        public TemplateModel getModel() {
+            TemplateModel model = new TemplateModel();
+            model.setRenderer(renderingEngine);
+            model.setContent(content);
 
             if (config.getPaginateIndex()) {
-                model.put("numberOfPages", 0);
-                model.put("currentPageNumber", 0);
-                model.put("previousFileName", "");
-                model.put("nextFileName", "");
+                model.setNumberOfPages(0);
+                model.setCurrentPageNuber(0);
+                model.setPreviousFilename("");
+                model.setNextFileName("");
             }
 
             return model;
diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/ConfigUtil.java b/jbake-core/src/main/java/org/jbake/app/configuration/ConfigUtil.java
index 08bcf0290..c0c6260f4 100644
--- a/jbake-core/src/main/java/org/jbake/app/configuration/ConfigUtil.java
+++ b/jbake-core/src/main/java/org/jbake/app/configuration/ConfigUtil.java
@@ -1,17 +1,19 @@
 package org.jbake.app.configuration;
 
-import org.apache.commons.configuration.CompositeConfiguration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.configuration.SystemConfiguration;
+import org.apache.commons.configuration2.CompositeConfiguration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.SystemConfiguration;
+import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.builder.fluent.Parameters;
+import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
+import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.jbake.app.JBakeException;
+import org.jbake.launcher.SystemExit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.net.URL;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.nio.charset.Charset;
 
 /**
@@ -21,44 +23,115 @@
  */
 public class ConfigUtil {
 
+    public static final char LIST_DELIMITER = ',';
+    public static final String DEFAULT_ENCODING = "UTF-8";
     private static final Logger LOGGER = LoggerFactory.getLogger(ConfigUtil.class);
-    private static final String LEGACY_CONFIG_FILE = "custom.properties";
-    private static final String CONFIG_FILE = "jbake.properties";
-    private static final String DEFAULT_CONFIG_FILE = "default.properties";
+    public static final String LEGACY_CONFIG_FILE = "custom.properties";
+    public static final String CONFIG_FILE = "jbake.properties";
+    public static final String DEFAULT_CONFIG_FILE = "default.properties";
+    private String encoding = DEFAULT_ENCODING;
 
-    private CompositeConfiguration load(File source) throws ConfigurationException {
+    private CompositeConfiguration load(File source, File propertiesFile) throws ConfigurationException {
 
         if (!source.exists()) {
-            throw new JBakeException("The given source folder '" + source.getAbsolutePath() + "' does not exist.");
+            throw new JBakeException(SystemExit.CONFIGURATION_ERROR, "The given source folder '" + source.getAbsolutePath() + "' does not exist.");
         }
         if (!source.isDirectory()) {
-            throw new JBakeException("The given source folder is not a directory.");
+            throw new JBakeException(SystemExit.CONFIGURATION_ERROR,"The given source folder is not a directory.");
         }
+
+        File legacyConfigFile = new File(source, LEGACY_CONFIG_FILE);
+        File customConfigFile = propertiesFile != null ? propertiesFile : new File(source, CONFIG_FILE);
+
         CompositeConfiguration config = new CompositeConfiguration();
-        config.setListDelimiter(',');
-        File customConfigFile = new File(source, LEGACY_CONFIG_FILE);
-        if (customConfigFile.exists()) {
+        config.setListDelimiterHandler(new DefaultListDelimiterHandler(LIST_DELIMITER));
+
+        if (legacyConfigFile.exists()) {
             displayLegacyConfigFileWarningIfRequired();
-            config.addConfiguration(new PropertiesConfiguration(customConfigFile));
+            config.addConfiguration(getFileBasedPropertiesConfiguration(legacyConfigFile));
         }
-        customConfigFile = new File(source, CONFIG_FILE);
         if (customConfigFile.exists()) {
-            config.addConfiguration(new PropertiesConfiguration(customConfigFile));
+            config.addConfiguration(getFileBasedPropertiesConfiguration(customConfigFile));
         }
         URL defaultPropertiesLocation = this.getClass().getClassLoader().getResource(DEFAULT_CONFIG_FILE);
-        config.addConfiguration(new PropertiesConfiguration(defaultPropertiesLocation));
+        if (defaultPropertiesLocation != null) {
+            config.addConfiguration(getFileBasedPropertiesConfiguration(defaultPropertiesLocation));
+        }
+
         config.addConfiguration(new SystemConfiguration());
         return config;
     }
 
+    private PropertiesConfiguration getFileBasedPropertiesConfiguration(File propertiesFile) throws ConfigurationException {
+        FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+            new FileBasedConfigurationBuilder<>(PropertiesConfiguration.class)
+                .configure(new Parameters().properties()
+                    .setFile(propertiesFile)
+                    .setEncoding(encoding)
+                    .setThrowExceptionOnMissing(true)
+                    .setListDelimiterHandler(new DefaultListDelimiterHandler(LIST_DELIMITER))
+                    .setIncludesAllowed(false));
+        return builder.getConfiguration();
+    }
+
+    private PropertiesConfiguration getFileBasedPropertiesConfiguration(URL propertiesFile) throws ConfigurationException {
+        FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+            new FileBasedConfigurationBuilder<>(PropertiesConfiguration.class)
+                .configure(new Parameters().properties()
+                    .setURL(propertiesFile)
+                    .setEncoding(encoding)
+                    .setThrowExceptionOnMissing(true)
+                    .setListDelimiterHandler(new DefaultListDelimiterHandler(LIST_DELIMITER))
+                    .setIncludesAllowed(false));
+        return builder.getConfiguration();
+    }
+
     private void displayLegacyConfigFileWarningIfRequired() {
         LOGGER.warn("You have defined a part of your JBake configuration in {}", LEGACY_CONFIG_FILE);
         LOGGER.warn("Usage of this file is being deprecated, please rename this file to: {} to remove this warning", CONFIG_FILE);
     }
 
+    /**
+     * Load a configuration.
+     *
+     * @param source the source directory of the project
+     * @param propertiesFile the properties file for the project
+     * @return the configuration
+     * @throws JBakeException if unable to configure
+     */
+    public JBakeConfiguration loadConfig(File source, File propertiesFile) throws JBakeException {
+        try {
+            CompositeConfiguration configuration = load(source, propertiesFile);
+            return new DefaultJBakeConfiguration(source, configuration);
+        } catch (ConfigurationException e) {
+            throw new JBakeException(SystemExit.CONFIGURATION_ERROR, e.getMessage(), e);
+        }
+    }
+
+    /**
+     * Load a configuration.
+     *
+     * @param source the source directory of the project
+     * @return the configuration
+     * @throws ConfigurationException if unable to configure
+     * @deprecated use {@link #loadConfig(File, File)} instead
+     */
+    @Deprecated
     public JBakeConfiguration loadConfig(File source) throws ConfigurationException {
-        CompositeConfiguration configuration = load(source);
-        return new DefaultJBakeConfiguration(source, configuration);
+        return loadConfig(source, null);
     }
 
+    public String getEncoding() {
+        return this.encoding;
+    }
+
+    public ConfigUtil setEncoding(String encoding) {
+        if (Charset.isSupported(encoding)) {
+            this.encoding = encoding;
+        } else {
+            this.encoding = DEFAULT_ENCODING;
+            LOGGER.warn("Unsupported encoding '{}'. Using default encoding '{}'", encoding, this.encoding);
+        }
+        return this;
+    }
 }
diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java b/jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java
index e28af05de..223b0f624 100644
--- a/jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java
+++ b/jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.java
@@ -1,32 +1,33 @@
 package org.jbake.app.configuration;
 
-import org.apache.commons.configuration.CompositeConfiguration;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.CompositeConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.MapConfiguration;
+import org.apache.commons.configuration2.SystemConfiguration;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static org.jbake.app.configuration.PropertyList.*;
+
 /**
  * The default implementation of a {@link JBakeConfiguration}
  */
 public class DefaultJBakeConfiguration implements JBakeConfiguration {
 
 
+    public static final String DEFAULT_TYHMELEAF_TEMPLATE_MODE = "HTML";
     private static final String SOURCE_FOLDER_KEY = "sourceFolder";
     private static final String DESTINATION_FOLDER_KEY = "destinationFolder";
     private static final String ASSET_FOLDER_KEY = "assetFolder";
     private static final String TEMPLATE_FOLDER_KEY = "templateFolder";
     private static final String CONTENT_FOLDER_KEY = "contentFolder";
+    private static final String DATA_FOLDER_KEY = "dataFolder";
     private static final Pattern TEMPLATE_DOC_PATTERN = Pattern.compile("(?:template\\.)([a-zA-Z0-9-_]+)(?:\\.file)");
     private static final String DOCTYPE_FILE_POSTFIX = ".file";
     private static final String DOCTYPE_EXTENSION_POSTFIX = ".extension";
@@ -58,7 +59,7 @@ public Object get(String key) {
 
     @Override
     public String getArchiveFileName() {
-        return getAsString(JBakeProperty.ARCHIVE_FILE);
+        return getAsString(ARCHIVE_FILE.getKey());
     }
 
     private boolean getAsBoolean(String key) {
@@ -74,7 +75,7 @@ private int getAsInt(String key, int defaultValue) {
     }
 
     private List<String> getAsList(String key) {
-        return Arrays.asList(compositeConfiguration.getStringArray(key));
+        return compositeConfiguration.getList(String.class, key);
     }
 
     private String getAsString(String key) {
@@ -87,24 +88,24 @@ private String getAsString(String key, String defaultValue) {
 
     @Override
     public List<String> getAsciidoctorAttributes() {
-        return getAsList(JBakeProperty.ASCIIDOCTOR_ATTRIBUTES);
+        return getAsList(ASCIIDOCTOR_ATTRIBUTES.getKey());
     }
 
-    public Object getAsciidoctorOption(String optionKey) {
-        Configuration subConfig = compositeConfiguration.subset(JBakeProperty.ASCIIDOCTOR_OPTION);
-        Object value = subConfig.getProperty(optionKey);
+    public List<String> getAsciidoctorOption(String optionKey) {
+        Configuration subConfig = compositeConfiguration.subset(ASCIIDOCTOR_OPTION.getKey());
 
-        if (value == null) {
-            logger.warn("Cannot find asciidoctor option '{}.{}'", JBakeProperty.ASCIIDOCTOR_OPTION, optionKey);
-            return "";
+        if (subConfig.containsKey(optionKey)) {
+            return subConfig.getList(String.class, optionKey);
+        } else {
+            logger.warn("Cannot find asciidoctor option '{}.{}'", ASCIIDOCTOR_OPTION.getKey(), optionKey);
+            return Collections.emptyList();
         }
-        return value;
     }
 
     @Override
     public List<String> getAsciidoctorOptionKeys() {
         List<String> options = new ArrayList<>();
-        Configuration subConfig = compositeConfiguration.subset(JBakeProperty.ASCIIDOCTOR_OPTION);
+        Configuration subConfig = compositeConfiguration.subset(ASCIIDOCTOR_OPTION.getKey());
 
         Iterator<String> iterator = subConfig.getKeys();
         while (iterator.hasNext()) {
@@ -128,35 +129,35 @@ public void setAssetFolder(File assetFolder) {
 
     @Override
     public String getAssetFolderName() {
-        return getAsString(JBakeProperty.ASSET_FOLDER);
+        return getAsString(ASSET_FOLDER.getKey());
     }
 
     @Override
     public boolean getAssetIgnoreHidden() {
-        return getAsBoolean(JBakeProperty.ASSET_IGNORE_HIDDEN);
+        return getAsBoolean(ASSET_IGNORE_HIDDEN.getKey());
     }
 
     public void setAssetIgnoreHidden(boolean assetIgnoreHidden) {
-        setProperty(JBakeProperty.ASSET_IGNORE_HIDDEN, assetIgnoreHidden);
+        setProperty(ASSET_IGNORE_HIDDEN.getKey(), assetIgnoreHidden);
     }
 
     @Override
     public String getAttributesExportPrefixForAsciidoctor() {
-        return getAsString(JBakeProperty.ASCIIDOCTOR_ATTRIBUTES_EXPORT_PREFIX, "");
+        return getAsString(ASCIIDOCTOR_ATTRIBUTES_EXPORT_PREFIX.getKey(), "");
     }
 
     @Override
     public String getBuildTimeStamp() {
-        return getAsString(JBakeProperty.BUILD_TIMESTAMP);
+        return getAsString(BUILD_TIMESTAMP.getKey());
     }
 
     @Override
     public boolean getClearCache() {
-        return getAsBoolean(JBakeProperty.CLEAR_CACHE);
+        return getAsBoolean(CLEAR_CACHE.getKey());
     }
 
     public void setClearCache(boolean clearCache) {
-        setProperty(JBakeProperty.CLEAR_CACHE, clearCache);
+        setProperty(CLEAR_CACHE.getKey(), clearCache);
     }
 
     public CompositeConfiguration getCompositeConfiguration() {
@@ -180,48 +181,75 @@ public void setContentFolder(File contentFolder) {
 
     @Override
     public String getContentFolderName() {
-        return getAsString(JBakeProperty.CONTENT_FOLDER);
+        return getAsString(CONTENT_FOLDER.getKey());
+    }
+
+    @Override
+    public File getDataFolder() {
+        return getAsFolder(DATA_FOLDER_KEY);
+    }
+
+    public void setDataFolder(File dataFolder) {
+        if (dataFolder != null) {
+            setProperty(DATA_FOLDER_KEY, dataFolder);
+        }
+    }
+
+    @Override
+    public String getDataFolderName() {
+        return getAsString(DATA_FOLDER.getKey());
+    }
+
+    @Override
+    public String getDataFileDocType() {
+        return getAsString(DATA_FILE_DOCTYPE.getKey());
+    }
+
+    public void setDataFileDocType(String dataFileDocType) {
+        setProperty(DATA_FILE_DOCTYPE.getKey(), dataFileDocType);
     }
 
     @Override
     public String getDatabasePath() {
-        return getAsString(JBakeProperty.DB_PATH);
+        return getAsString(DB_PATH.getKey());
     }
 
     public void setDatabasePath(String path) {
-        setProperty(JBakeProperty.DB_PATH, path);
+        setProperty(DB_PATH.getKey(), path);
     }
 
     @Override
     public String getDatabaseStore() {
-        return getAsString(JBakeProperty.DB_STORE);
+        return getAsString(DB_STORE.getKey());
     }
 
     public void setDatabaseStore(String storeType) {
-        setProperty(JBakeProperty.DB_STORE, storeType);
+        setProperty(DB_STORE.getKey(), storeType);
     }
 
+
+
     @Override
     public String getDateFormat() {
-        return getAsString(JBakeProperty.DATE_FORMAT);
+        return getAsString(DATE_FORMAT.getKey());
     }
 
     @Override
     public String getDefaultStatus() {
-        return getAsString(JBakeProperty.DEFAULT_STATUS, "");
+        return getAsString(DEFAULT_STATUS.getKey(), "");
     }
 
     public void setDefaultStatus(String status) {
-        setProperty(JBakeProperty.DEFAULT_STATUS, status);
+        setProperty(DEFAULT_STATUS.getKey(), status);
     }
 
     @Override
     public String getDefaultType() {
-        return getAsString(JBakeProperty.DEFAULT_TYPE, "");
+        return getAsString(DEFAULT_TYPE.getKey(), "");
     }
 
     public void setDefaultType(String type) {
-        setProperty(JBakeProperty.DEFAULT_TYPE, type);
+        setProperty(DEFAULT_TYPE.getKey(), type);
     }
 
     @Override
@@ -252,7 +280,12 @@ public List<String> getDocumentTypes() {
 
     @Override
     public String getDraftSuffix() {
-        return getAsString(JBakeProperty.DRAFT_SUFFIX, "");
+        return getAsString(DRAFT_SUFFIX.getKey(), "");
+    }
+
+    @Override
+    public String getError404FileName() {
+        return getAsString(ERROR404_FILE.getKey());
     }
 
     @Override
@@ -262,17 +295,22 @@ public String getExampleProjectByType(String templateType) {
 
     @Override
     public boolean getExportAsciidoctorAttributes() {
-        return getAsBoolean(JBakeProperty.ASCIIDOCTOR_ATTRIBUTES_EXPORT);
+        return getAsBoolean(ASCIIDOCTOR_ATTRIBUTES_EXPORT.getKey());
     }
 
     @Override
     public String getFeedFileName() {
-        return getAsString(JBakeProperty.FEED_FILE);
+        return getAsString(FEED_FILE.getKey());
+    }
+
+    @Override
+    public String getIgnoreFileName() {
+        return getAsString(IGNORE_FILE.getKey());
     }
 
     @Override
     public String getIndexFileName() {
-        return getAsString(JBakeProperty.INDEX_FILE);
+        return getAsString(INDEX_FILE.getKey());
     }
 
     @Override
@@ -282,20 +320,20 @@ public Iterator<String> getKeys() {
 
     @Override
     public List<String> getMarkdownExtensions() {
-        return getAsList(JBakeProperty.MARKDOWN_EXTENSIONS);
+        return getAsList(MARKDOWN_EXTENSIONS.getKey());
     }
 
     public void setMarkdownExtensions(String... extensions) {
-        setProperty(JBakeProperty.MARKDOWN_EXTENSIONS, StringUtils.join(extensions, ","));
+        setProperty(MARKDOWN_EXTENSIONS.getKey(), StringUtils.join(extensions, ","));
     }
 
     @Override
     public String getOutputExtension() {
-        return getAsString(JBakeProperty.OUTPUT_EXTENSION);
+        return getAsString(OUTPUT_EXTENSION.getKey());
     }
 
     public void setOutputExtension(String outputExtension) {
-        setProperty(JBakeProperty.OUTPUT_EXTENSION, outputExtension);
+        setProperty(OUTPUT_EXTENSION.getKey(), outputExtension);
     }
 
     @Override
@@ -307,96 +345,106 @@ public String getOutputExtensionByDocType(String docType) {
 
     @Override
     public boolean getPaginateIndex() {
-        return getAsBoolean(JBakeProperty.PAGINATE_INDEX);
+        return getAsBoolean(PAGINATE_INDEX.getKey());
     }
 
     public void setPaginateIndex(boolean paginateIndex) {
-        setProperty(JBakeProperty.PAGINATE_INDEX, paginateIndex);
+        setProperty(PAGINATE_INDEX.getKey(), paginateIndex);
     }
 
     @Override
     public int getPostsPerPage() {
-        return getAsInt(JBakeProperty.POSTS_PER_PAGE, 5);
+        return getAsInt(POSTS_PER_PAGE.getKey(), 5);
     }
 
     public void setPostsPerPage(int postsPerPage) {
-        setProperty(JBakeProperty.POSTS_PER_PAGE, postsPerPage);
+        setProperty(POSTS_PER_PAGE.getKey(), postsPerPage);
     }
 
     @Override
     public String getPrefixForUriWithoutExtension() {
-        return getAsString(JBakeProperty.URI_NO_EXTENSION_PREFIX);
+        return getAsString(URI_NO_EXTENSION_PREFIX.getKey());
     }
 
     public void setPrefixForUriWithoutExtension(String prefix) {
-        setProperty(JBakeProperty.URI_NO_EXTENSION_PREFIX, prefix);
+        setProperty(URI_NO_EXTENSION_PREFIX.getKey(), prefix);
     }
 
     @Override
     public boolean getRenderArchive() {
-        return getAsBoolean(JBakeProperty.RENDER_ARCHIVE);
+        return getAsBoolean(RENDER_ARCHIVE.getKey());
     }
 
     @Override
     public String getRenderEncoding() {
-        return getAsString(JBakeProperty.RENDER_ENCODING);
+        return getAsString(RENDER_ENCODING.getKey());
+    }
+
+    @Override
+    public String getOutputEncoding() {
+        return getAsString(OUTPUT_ENCODING.getKey());
+    }
+
+    @Override
+    public boolean getRenderError404() {
+        return getAsBoolean(RENDER_ERROR404.getKey());
     }
 
     @Override
     public boolean getRenderFeed() {
-        return getAsBoolean(JBakeProperty.RENDER_FEED);
+        return getAsBoolean(RENDER_FEED.getKey());
     }
 
     @Override
     public boolean getRenderIndex() {
-        return getAsBoolean(JBakeProperty.RENDER_INDEX);
+        return getAsBoolean(RENDER_INDEX.getKey());
     }
 
     @Override
     public boolean getRenderSiteMap() {
-        return getAsBoolean(JBakeProperty.RENDER_SITEMAP);
+        return getAsBoolean(RENDER_SITEMAP.getKey());
     }
 
     @Override
     public boolean getRenderTags() {
-        return getAsBoolean(JBakeProperty.RENDER_TAGS);
+        return getAsBoolean(RENDER_TAGS.getKey());
     }
 
     @Override
     public boolean getRenderTagsIndex() {
-        return compositeConfiguration.getBoolean(JBakeProperty.RENDER_TAGS_INDEX, false);
+        return compositeConfiguration.getBoolean(RENDER_TAGS_INDEX.getKey(), false);
     }
 
     public void setRenderTagsIndex(boolean enable) {
-        compositeConfiguration.setProperty(JBakeProperty.RENDER_TAGS_INDEX, enable);
+        compositeConfiguration.setProperty(RENDER_TAGS_INDEX.getKey(), enable);
     }
 
     @Override
     public boolean getSanitizeTag() {
-        return getAsBoolean(JBakeProperty.TAG_SANITIZE);
+        return getAsBoolean(TAG_SANITIZE.getKey());
     }
 
     @Override
     public int getServerPort() {
-        return getAsInt(JBakeProperty.SERVER_PORT, 8080);
+        return getAsInt(SERVER_PORT.getKey(), 8080);
     }
 
     public void setServerPort(int port) {
-        setProperty(JBakeProperty.SERVER_PORT, port);
+        setProperty(SERVER_PORT.getKey(), port);
     }
 
     @Override
     public String getSiteHost() {
-        return getAsString(JBakeProperty.SITE_HOST, "http://www.jbake.org");
+        return getAsString(SITE_HOST.getKey(), "http://www.jbake.org");
     }
 
     public void setSiteHost(String siteHost) {
-        setProperty(JBakeProperty.SITE_HOST, siteHost);
+        setProperty(SITE_HOST.getKey(), siteHost);
     }
 
     @Override
     public String getSiteMapFileName() {
-        return getAsString(JBakeProperty.SITEMAP_FILE);
+        return getAsString(SITEMAP_FILE.getKey());
     }
 
     @Override
@@ -411,25 +459,34 @@ public void setSourceFolder(File sourceFolder) {
 
     @Override
     public String getTagPathName() {
-        return getAsString(JBakeProperty.TAG_PATH);
+        return getAsString(TAG_PATH.getKey());
     }
 
     @Override
     public String getTemplateEncoding() {
-        return getAsString(JBakeProperty.TEMPLATE_ENCODING);
+        return getAsString(TEMPLATE_ENCODING.getKey());
     }
 
     @Override
-    public File getTemplateFileByDocType(String docType) {
+    public String getTemplateByDocType(String docType) {
         String templateKey = DOCTYPE_TEMPLATE_PREFIX + docType + DOCTYPE_FILE_POSTFIX;
         String templateFileName = getAsString(templateKey);
         if (templateFileName != null) {
-            return new File(getTemplateFolder(), templateFileName);
+            return templateFileName;
         }
         logger.warn("Cannot find configuration key '{}' for document type '{}'", templateKey, docType);
         return null;
     }
 
+    @Override
+    public File getTemplateFileByDocType(String docType) {
+        String templateFileName = getTemplateByDocType(docType);
+        if (templateFileName != null) {
+            return new File(getTemplateFolder(), templateFileName);
+        }
+        return null;
+    }
+
     @Override
     public File getTemplateFolder() {
         return getAsFolder(TEMPLATE_FOLDER_KEY);
@@ -443,30 +500,30 @@ public void setTemplateFolder(File templateFolder) {
 
     @Override
     public String getTemplateFolderName() {
-        return getAsString(JBakeProperty.TEMPLATE_FOLDER);
+        return getAsString(TEMPLATE_FOLDER.getKey());
     }
 
     @Override
     public String getThymeleafLocale() {
-        return getAsString(JBakeProperty.THYMELEAF_LOCALE);
+        return getAsString(THYMELEAF_LOCALE.getKey());
     }
 
     @Override
     public boolean getUriWithoutExtension() {
-        return getAsBoolean(JBakeProperty.URI_NO_EXTENSION);
+        return getAsBoolean(URI_NO_EXTENSION.getKey());
     }
 
     public void setUriWithoutExtension(boolean withoutExtension) {
-        setProperty(JBakeProperty.URI_NO_EXTENSION, withoutExtension);
+        setProperty(URI_NO_EXTENSION.getKey(), withoutExtension);
     }
 
     @Override
     public String getVersion() {
-        return getAsString(JBakeProperty.VERSION);
+        return getAsString(VERSION.getKey());
     }
 
     public void setDestinationFolderName(String folderName) {
-        setProperty(JBakeProperty.DESTINATION_FOLDER, folderName);
+        setProperty(DESTINATION_FOLDER.getKey(), folderName);
         setupDefaultDestination();
     }
 
@@ -477,17 +534,43 @@ public void setExampleProject(String type, String fileName) {
 
     @Override
     public void setProperty(String key, Object value) {
+
         compositeConfiguration.setProperty(key, value);
     }
 
+    @Override
+    public String getThymeleafModeByType(String type) {
+        String key = "template_" + type + "_thymeleaf_mode";
+        return getAsString(key, DEFAULT_TYHMELEAF_TEMPLATE_MODE);
+    }
+
     @Override
     public String getServerContextPath() {
-        return getAsString(JBakeProperty.SERVER_CONTEXT_PATH);
+        return getAsString(SERVER_CONTEXT_PATH.getKey());
     }
 
     @Override
     public String getServerHostname() {
-        return getAsString(JBakeProperty.SERVER_HOSTNAME);
+        return getAsString(SERVER_HOSTNAME.getKey());
+    }
+
+    @Override
+    public Map<String, Object> asHashMap() {
+        HashMap<String, Object> configModel = new HashMap<>();
+        Iterator<String> configKeys = this.getKeys();
+        while (configKeys.hasNext()) {
+            String key = configKeys.next();
+            Object valueObject;
+
+            if (key.equals(PAGINATE_INDEX.getKey())) {
+                valueObject = this.getPaginateIndex();
+            } else {
+                valueObject = this.get(key);
+            }
+            //replace "." in key so you can use dot notation in templates
+            configModel.put(key.replace(".", "_"), valueObject);
+        }
+        return configModel;
     }
 
     public void setTemplateExtensionForDocType(String docType, String extension) {
@@ -505,10 +588,11 @@ private void setupPaths() {
         setupDefaultAssetFolder();
         setupDefaultTemplateFolder();
         setupDefaultContentFolder();
+        setupDefaultDataFolder();
     }
 
     private void setupDefaultDestination() {
-        String destinationPath = getAsString(JBakeProperty.DESTINATION_FOLDER);
+        String destinationPath = getAsString(DESTINATION_FOLDER.getKey());
 
         File destination = new File(destinationPath);
         if ( destination.isAbsolute() ) {
@@ -519,7 +603,7 @@ private void setupDefaultDestination() {
     }
 
     private void setupDefaultAssetFolder() {
-        String assetFolder = getAsString(JBakeProperty.ASSET_FOLDER);
+        String assetFolder = getAsString(ASSET_FOLDER.getKey());
 
 
         File asset = new File(assetFolder);
@@ -531,7 +615,7 @@ private void setupDefaultAssetFolder() {
     }
 
     private void setupDefaultTemplateFolder() {
-        String templateFolder = getAsString(JBakeProperty.TEMPLATE_FOLDER);
+        String templateFolder = getAsString(TEMPLATE_FOLDER.getKey());
 
         File template = new File(templateFolder);
         if(template.isAbsolute()) {
@@ -541,34 +625,90 @@ private void setupDefaultTemplateFolder() {
         }
     }
 
+    private void setupDefaultDataFolder() {
+        String dataFolder = getAsString(DATA_FOLDER.getKey());
+
+        File data = new File(dataFolder);
+        if(data.isAbsolute()) {
+            setDataFolder(data);
+        } else {
+            setDataFolder(new File(getSourceFolder(), dataFolder));
+        }
+    }
+
     private void setupDefaultContentFolder() {
         setContentFolder(new File(getSourceFolder(), getContentFolderName()));
     }
 
     @Override
     public String getHeaderSeparator() {
-        return getAsString(JBakeProperty.HEADER_SEPARATOR);
+        return getAsString(HEADER_SEPARATOR.getKey());
     }
 
     public void setHeaderSeparator(String headerSeparator) {
-        setProperty(JBakeProperty.HEADER_SEPARATOR, headerSeparator);
+        setProperty(HEADER_SEPARATOR.getKey(), headerSeparator);
     }
 
     @Override
     public boolean getImgPathPrependHost() {
-        return getAsBoolean(JBakeProperty.IMG_PATH_PREPEND_HOST);
+        return getAsBoolean(IMG_PATH_PREPEND_HOST.getKey());
     }
 
     public void setImgPathPrependHost(boolean imgPathPrependHost) {
-        setProperty(JBakeProperty.IMG_PATH_PREPEND_HOST, imgPathPrependHost);
+        setProperty(IMG_PATH_PREPEND_HOST.getKey(), imgPathPrependHost);
     }
 
     @Override
     public boolean getImgPathUpdate() {
-        return getAsBoolean(JBakeProperty.IMG_PATH_UPDATE);
+        return getAsBoolean(IMG_PATH_UPDATE.getKey());
     }
 
     public void setImgPathUPdate(boolean imgPathUpdate) {
-        setProperty(JBakeProperty.IMG_PATH_UPDATE, imgPathUpdate);
+        setProperty(IMG_PATH_UPDATE.getKey(), imgPathUpdate);
+    }
+
+    public List<Property> getJbakeProperties() {
+
+        List<Property> jbakeKeys = new ArrayList<>();
+
+        for (int i = 0; i < compositeConfiguration.getNumberOfConfigurations(); i++) {
+            Configuration configuration = compositeConfiguration.getConfiguration(i);
+
+            if (!(configuration instanceof SystemConfiguration)) {
+                for (Iterator<String> it = configuration.getKeys(); it.hasNext(); ) {
+                    String key = it.next();
+                    Property property = PropertyList.getPropertyByKey(key);
+                    if (!jbakeKeys.contains(property)) {
+                        jbakeKeys.add(property);
+                    }
+                }
+            }
+        }
+        Collections.sort(jbakeKeys);
+        return jbakeKeys;
+    }
+
+    @Override
+    public void addConfiguration(Properties properties) {
+        compositeConfiguration.addConfiguration(new MapConfiguration(properties));
+    }
+
+    @Override
+    public String getAbbreviatedGitHash() {
+        return getAsString(GIT_HASH.getKey());
+    }
+
+    @Override
+    public String getJvmLocale() {
+        return getAsString(JVM_LOCALE.getKey());
+    }
+
+    @Override
+    public TimeZone getFreemarkerTimeZone() {
+        String timezone = getAsString(FREEMARKER_TIMEZONE.getKey());
+        if (StringUtils.isNotEmpty(timezone)) {
+            return TimeZone.getTimeZone(timezone);
+        }
+        return null;
     }
 }
diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java b/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java
index 218c62177..98e2625db 100644
--- a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java
+++ b/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfiguration.java
@@ -3,6 +3,9 @@
 import java.io.File;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.TimeZone;
 
 /**
  * JBakeConfiguration gives you access to the project configuration. Typically located in a file called jbake.properties.
@@ -84,6 +87,21 @@ public interface JBakeConfiguration {
      */
     String getContentFolderName();
 
+    /**
+     * @return the data folder
+     */
+    File getDataFolder();
+
+    /**
+     * @return name of Folder where data files reside in
+     */
+    String getDataFolderName();
+
+    /**
+     * @return docType for data files
+     */
+    String getDataFileDocType();
+
     /**
      * @return Folder to store database files in
      */
@@ -123,6 +141,11 @@ public interface JBakeConfiguration {
      */
     String getDraftSuffix();
 
+    /**
+     * @return Output filename for error404 file, is only used when {@link #getRenderError404()} is true
+     */
+    String getError404FileName();
+
     /**
      * Get name for example project name by given template type
      *
@@ -137,7 +160,7 @@ public interface JBakeConfiguration {
     boolean getExportAsciidoctorAttributes();
 
     /**
-     * @return Output filename for feed file, is only used when {@link #getRenderFeed()} der} is true
+     * @return Output filename for feed file, is only used when {@link #getRenderFeed()} is true
      */
     String getFeedFileName();
 
@@ -147,6 +170,11 @@ public interface JBakeConfiguration {
      */
     String getHeaderSeparator();
 
+    /**
+     * @return Filename to use to ignore a directory in addition to ".jbakeignore"
+     */
+    String getIgnoreFileName();
+
     /**
      * @return Output filename for index, is only used when {@link #getRenderIndex()} is true
      */
@@ -200,6 +228,16 @@ public interface JBakeConfiguration {
      */
     String getRenderEncoding();
 
+    /**
+     * @return Output encoding for freemarker url escaping
+     */
+    String getOutputEncoding();
+
+    /**
+     * @return Flag indicating if error404 file should be generated
+     */
+    boolean getRenderError404();
+
     /**
      * @return Flag indicating if feed file should be generated
      */
@@ -260,7 +298,9 @@ public interface JBakeConfiguration {
      */
     String getTemplateEncoding();
 
-    File getTemplateFileByDocType(String masterindex);
+    String getTemplateByDocType(String doctype);
+
+    File getTemplateFileByDocType(String doctype);
 
     /**
      * @return the template folder
@@ -307,8 +347,37 @@ public interface JBakeConfiguration {
      */
     void setProperty(String key, Object value);
 
+    /**
+     *
+     * @param type the documents type
+     * @return the the thymeleaf render mode ( defaults to {@link DefaultJBakeConfiguration#DEFAULT_TYHMELEAF_TEMPLATE_MODE} )
+     */
+    String getThymeleafModeByType(String type);
+
     String getServerContextPath();
 
     String getServerHostname();
+
+    /**
+     * @return Abbreviated hash of latest git commit
+     */
+    String getAbbreviatedGitHash();
+
+    /**
+     * @return Locale to set in the JVM
+     */
+    String getJvmLocale();
+
+    /**
+     *
+     * @return TimeZone to use within Freemarker
+     */
+    TimeZone getFreemarkerTimeZone();
+
+    Map<String, Object> asHashMap();
+
+    List<Property> getJbakeProperties();
+
+    void addConfiguration(Properties properties);
 }
 
diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfigurationFactory.java b/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfigurationFactory.java
index 06220e5fb..1ff3fa764 100644
--- a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfigurationFactory.java
+++ b/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfigurationFactory.java
@@ -1,7 +1,8 @@
 package org.jbake.app.configuration;
 
-import org.apache.commons.configuration.CompositeConfiguration;
-import org.apache.commons.configuration.ConfigurationException;
+
+import org.apache.commons.configuration2.CompositeConfiguration;
+import org.jbake.app.JBakeException;
 
 import java.io.File;
 
@@ -17,19 +18,31 @@ public JBakeConfigurationFactory() {
     }
 
     /**
-     * Creates a {@link DefaultJBakeConfiguration}
+     * Creates a {@link DefaultJBakeConfiguration} using default.properties and jbake.properties
+     *
      * @param sourceFolder The source folder of the project
      * @param destination The destination folder to render and copy files to
      * @param isClearCache Whether to clear database cache or not
      * @return A configuration by given parameters
-     * @throws ConfigurationException if loading the configuration fails
+     * @throws JBakeException if loading the configuration fails
      */
-    public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFolder, File destination, boolean isClearCache) throws ConfigurationException {
+    public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFolder, File destination, boolean isClearCache) throws JBakeException {
+        return createDefaultJbakeConfiguration(sourceFolder, destination, (File) null, isClearCache);
+    }
 
-        DefaultJBakeConfiguration configuration = (DefaultJBakeConfiguration) getConfigUtil().loadConfig(sourceFolder);
+    /**
+     * Creates a {@link DefaultJBakeConfiguration}
+     * @param sourceFolder The source folder of the project
+     * @param destination The destination folder to render and copy files to
+     * @param propertiesFile The properties file for the project
+     * @param isClearCache Whether to clear database cache or not
+     * @return A configuration by given parameters
+     * @throws JBakeException if loading the configuration fails
+     */
+    public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFolder, File destination, File propertiesFile, boolean isClearCache) throws JBakeException {
+        DefaultJBakeConfiguration configuration = (DefaultJBakeConfiguration) getConfigUtil().loadConfig(sourceFolder, propertiesFile);
         configuration.setDestinationFolder(destination);
         configuration.setClearCache(isClearCache);
-
         return configuration;
     }
 
@@ -43,8 +56,10 @@ public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFold
      * @param compositeConfiguration A given {@link CompositeConfiguration}
      * @param isClearCache Whether to clear database cache or not
      * @return A configuration by given parameters
+     * @deprecated use {@link #createDefaultJbakeConfiguration(File, File, File, boolean)} instead
      */
-    public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFolder, File destination, CompositeConfiguration compositeConfiguration, boolean isClearCache) {
+    @Deprecated
+    public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFolder, File destination, CompositeConfiguration compositeConfiguration, boolean isClearCache) throws JBakeException {
         DefaultJBakeConfiguration configuration = new DefaultJBakeConfiguration(sourceFolder, compositeConfiguration);
         configuration.setDestinationFolder(destination);
         configuration.setClearCache(isClearCache);
@@ -60,8 +75,10 @@ public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFold
      * @param destination The destination folder to render and copy files to
      * @param compositeConfiguration A given {@link CompositeConfiguration}
      * @return A configuration by given parameters
+     * @deprecated use {@link #createDefaultJbakeConfiguration(File, File, File, boolean)} instead
      */
-    public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFolder, File destination, CompositeConfiguration compositeConfiguration) {
+    @Deprecated
+    public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFolder, File destination, CompositeConfiguration compositeConfiguration) throws JBakeException {
         DefaultJBakeConfiguration configuration = new DefaultJBakeConfiguration(sourceFolder, compositeConfiguration);
         configuration.setDestinationFolder(destination);
         return configuration;
@@ -75,7 +92,8 @@ public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFold
      * @param config A {@link CompositeConfiguration}
      * @return A configuration by given parameters
      */
-    public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFolder, CompositeConfiguration config) {
+    @Deprecated
+    public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFolder, CompositeConfiguration config) throws JBakeException {
         return new DefaultJBakeConfiguration(sourceFolder,config);
     }
 
@@ -88,10 +106,28 @@ public DefaultJBakeConfiguration createDefaultJbakeConfiguration(File sourceFold
      * @param destinationFolder The destination folder to render and copy files to
      * @param isClearCache Whether to clear database cache or not
      * @return A configuration by given parameters
-     * @throws ConfigurationException if loading the configuration fails
+     * @throws JBakeException if loading the configuration fails
+     * @deprecated use {@link #createJettyJbakeConfiguration(File, File, File, boolean)} instead
+     */
+    @Deprecated
+    public DefaultJBakeConfiguration createJettyJbakeConfiguration(File sourceFolder, File destinationFolder, boolean isClearCache) throws JBakeException {
+        return createJettyJbakeConfiguration(sourceFolder, destinationFolder, (File)null, isClearCache);
+    }
+
+    /**
+     * Creates a {@link DefaultJBakeConfiguration} with value site.host replaced
+     * by http://localhost:[server.port].
+     * The server.port is read from the project properties file.
+     *
+     * @param sourceFolder The source folder of the project
+     * @param destinationFolder The destination folder to render and copy files to
+     * @param propertiesFile The properties file for the project
+     * @param isClearCache Whether to clear database cache or not
+     * @return A configuration by given parameters
+     * @throws JBakeException if loading the configuration fails
      */
-    public DefaultJBakeConfiguration createJettyJbakeConfiguration(File sourceFolder, File destinationFolder, boolean isClearCache) throws ConfigurationException {
-        DefaultJBakeConfiguration configuration = (DefaultJBakeConfiguration) getConfigUtil().loadConfig(sourceFolder);
+    public DefaultJBakeConfiguration createJettyJbakeConfiguration(File sourceFolder, File destinationFolder, File propertiesFile, boolean isClearCache) throws JBakeException {
+        DefaultJBakeConfiguration configuration = (DefaultJBakeConfiguration) getConfigUtil().loadConfig(sourceFolder, propertiesFile);
         configuration.setDestinationFolder(destinationFolder);
         configuration.setClearCache(isClearCache);
         configuration.setSiteHost("http://" + configuration.getServerHostname() + ":" +configuration.getServerPort() + configuration.getServerContextPath());
@@ -105,4 +141,9 @@ public ConfigUtil getConfigUtil() {
     public void setConfigUtil(ConfigUtil configUtil) {
         this.configUtil = configUtil;
     }
+
+    public JBakeConfigurationFactory setEncoding(String charset) {
+        this.configUtil.setEncoding(charset);
+        return this;
+    }
 }
diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfigurationInspector.java b/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfigurationInspector.java
index 2fb214d96..abe3737cf 100644
--- a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfigurationInspector.java
+++ b/jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfigurationInspector.java
@@ -2,11 +2,15 @@
 
 import org.jbake.app.FileUtil;
 import org.jbake.app.JBakeException;
+import org.jbake.launcher.SystemExit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
 
+import static org.jbake.app.configuration.PropertyList.CONTENT_FOLDER;
+import static org.jbake.app.configuration.PropertyList.TEMPLATE_FOLDER;
+
 public class JBakeConfigurationInspector {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(JBakeConfigurationInspector.class);
@@ -28,21 +32,21 @@ public void inspect() throws JBakeException {
     private void ensureSource() throws JBakeException {
         File source = configuration.getSourceFolder();
         if (!FileUtil.isExistingFolder(source)) {
-            throw new JBakeException("Error: Source folder must exist: " + source.getAbsolutePath());
+            throw new JBakeException(SystemExit.CONFIGURATION_ERROR, "Error: Source folder must exist: " + source.getAbsolutePath());
         }
         if (!configuration.getSourceFolder().canRead()) {
-            throw new JBakeException("Error: Source folder is not readable: " + source.getAbsolutePath());
+            throw new JBakeException(SystemExit.CONFIGURATION_ERROR, "Error: Source folder is not readable: " + source.getAbsolutePath());
         }
     }
 
     private void ensureTemplateFolder() {
         File path = configuration.getTemplateFolder();
-        checkRequiredFolderExists(JBakeProperty.TEMPLATE_FOLDER, path);
+        checkRequiredFolderExists(TEMPLATE_FOLDER.getKey(), path);
     }
 
     private void ensureContentFolder() {
         File path = configuration.getContentFolder();
-        checkRequiredFolderExists(JBakeProperty.CONTENT_FOLDER, path);
+        checkRequiredFolderExists(CONTENT_FOLDER.getKey(), path);
     }
 
     private void ensureDestination() {
@@ -51,7 +55,7 @@ private void ensureDestination() {
             destination.mkdirs();
         }
         if (!destination.canWrite()) {
-            throw new JBakeException("Error: Destination folder is not writable: " + destination.getAbsolutePath());
+            throw new JBakeException(SystemExit.CONFIGURATION_ERROR, "Error: Destination folder is not writable: " + destination.getAbsolutePath());
         }
     }
 
@@ -62,9 +66,9 @@ private void checkAssetFolder() {
         }
     }
 
-    private void checkRequiredFolderExists(String property, File path) {
+    private void checkRequiredFolderExists(String folderName, File path) {
         if (!FileUtil.isExistingFolder(path)) {
-            throw new JBakeException("Error: Required folder cannot be found! Expected to find [" + property + "] at: " + path.getAbsolutePath());
+            throw new JBakeException(SystemExit.CONFIGURATION_ERROR, "Error: Required folder cannot be found! Expected to find [" + folderName + "] at: " + path.getAbsolutePath());
         }
     }
 
diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeProperty.java b/jbake-core/src/main/java/org/jbake/app/configuration/JBakeProperty.java
deleted file mode 100644
index 0c5159ccd..000000000
--- a/jbake-core/src/main/java/org/jbake/app/configuration/JBakeProperty.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.jbake.app.configuration;
-
-public class JBakeProperty {
-
-    public static final String ARCHIVE_FILE = "archive.file";
-    public static final String ASCIIDOCTOR_ATTRIBUTES = "asciidoctor.attributes";
-    public static final String ASCIIDOCTOR_ATTRIBUTES_EXPORT = "asciidoctor.attributes.export";
-    public static final String ASCIIDOCTOR_OPTION = "asciidoctor.option";
-    public static final String ASCIIDOCTOR_ATTRIBUTES_EXPORT_PREFIX = "asciidoctor.attributes.export.prefix";
-    public static final String ASSET_FOLDER = "asset.folder";
-    public static final String ASSET_IGNORE_HIDDEN = "asset.ignore";
-    public static final String BUILD_TIMESTAMP = "build.timestamp";
-    public static final String CLEAR_CACHE = "db.clear.cache";
-    public static final String CONTENT_FOLDER = "content.folder";
-    public static final String DATE_FORMAT = "date.format";
-    public static final String DB_STORE = "db.store";
-    public static final String DB_PATH = "db.path";
-    public static final String DEFAULT_STATUS = "default.status";
-    public static final String DEFAULT_TYPE = "default.type";
-    public static final String DESTINATION_FOLDER = "destination.folder";
-    public static final String DRAFT_SUFFIX = "draft.suffix";
-    public static final String FEED_FILE = "feed.file";
-    public static final String HEADER_SEPARATOR = "header.separator";
-    public static final String INDEX_FILE = "index.file";
-    public static final String MARKDOWN_EXTENSIONS = "markdown.extensions";
-    public static final String OUTPUT_EXTENSION = "output.extension";
-    public static final String PAGINATE_INDEX = "index.paginate";
-    public static final String POSTS_PER_PAGE = "index.posts_per_page";
-    public static final String RENDER_ARCHIVE = "render.archive";
-    public static final String RENDER_FEED = "render.feed";
-    public static final String RENDER_INDEX = "render.index";
-    public static final String RENDER_SITEMAP = "render.sitemap";
-    public static final String RENDER_TAGS = "render.tags";
-    public static final String RENDER_TAGS_INDEX = "render.tagsindex";
-    public static final String RENDER_ENCODING = "render.encoding";
-    public static final String SERVER_PORT = "server.port";
-    public static final String SERVER_HOSTNAME = "server.hostname";
-    public static final String SERVER_CONTEXT_PATH = "server.contextPath";
-    public static final String SITE_HOST = "site.host";
-    public static final String SITEMAP_FILE = "sitemap.file";
-    public static final String TAG_SANITIZE = "tag.sanitize";
-    public static final String TAG_PATH = "tag.path";
-    public static final String TEMPLATE_FOLDER = "template.folder";
-    public static final String TEMPLATE_ENCODING = "template.encoding";
-    public static final String THYMELEAF_LOCALE = "thymeleaf.locale";
-    public static final String URI_NO_EXTENSION = "uri.noExtension";
-    public static final String URI_NO_EXTENSION_PREFIX = "uri.noExtension.prefix";
-    public static final String IMG_PATH_UPDATE = "img.path.update";
-    public static final String IMG_PATH_PREPEND_HOST = "img.path.prepend.host";
-    public static final String VERSION = "version";
-
-    private JBakeProperty() {}
-
-}
diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/Property.java b/jbake-core/src/main/java/org/jbake/app/configuration/Property.java
new file mode 100644
index 000000000..3ea349763
--- /dev/null
+++ b/jbake-core/src/main/java/org/jbake/app/configuration/Property.java
@@ -0,0 +1,72 @@
+package org.jbake.app.configuration;
+
+import java.util.Objects;
+
+public class Property implements Comparable<Property> {
+
+    private final String key;
+    private final String description;
+    private final Group group;
+
+    public Property(String key, String description) {
+        this(key, description, Group.DEFAULT);
+    }
+
+    public Property(String key, String description, Group group) {
+        this.key = key;
+        this.description = description;
+        this.group = group;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public Group getGroup() {
+        return group;
+    }
+
+    @Override
+    public String toString() {
+        return getKey();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Property property = (Property) o;
+        return Objects.equals(key, property.key) &&
+            Objects.equals(description, property.description) &&
+            group == property.group;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(key, description, group);
+    }
+
+    @Override
+    public int compareTo(Property other) {
+        int result = this.getGroup().compareTo(other.getGroup());
+
+        if (result == 0) {
+            result = this.getKey().compareTo(other.getKey());
+        }
+        return result;
+    }
+
+    public enum Group {
+        DEFAULT, CUSTOM
+    }
+
+
+}
diff --git a/jbake-core/src/main/java/org/jbake/app/configuration/PropertyList.java b/jbake-core/src/main/java/org/jbake/app/configuration/PropertyList.java
new file mode 100644
index 000000000..99db20081
--- /dev/null
+++ b/jbake-core/src/main/java/org/jbake/app/configuration/PropertyList.java
@@ -0,0 +1,371 @@
+package org.jbake.app.configuration;
+
+import java.lang.reflect.Field;
+
+import static org.jbake.app.configuration.Property.Group.CUSTOM;
+
+public abstract class PropertyList {
+
+    public static final Property ARCHIVE_FILE = new Property(
+        "archive.file",
+        "Output filename for archive file"
+    );
+
+    public static final Property ASCIIDOCTOR_ATTRIBUTES = new Property(
+        "asciidoctor.attributes",
+        "attributes to be set when processing input"
+    );
+
+    public static final Property ASCIIDOCTOR_ATTRIBUTES_EXPORT = new Property(
+        "asciidoctor.attributes.export",
+        "Prefix to be used when exporting JBake properties to Asciidoctor"
+    );
+
+    public static final Property ASCIIDOCTOR_ATTRIBUTES_EXPORT_PREFIX = new Property(
+        "asciidoctor.attributes.export.prefix",
+        "prefix that should be used when JBake config options are exported"
+    );
+
+    public static final Property ASCIIDOCTOR_OPTION = new Property(
+        "asciidoctor.option",
+        "default asciidoctor options"
+    );
+
+    public static final Property ASSET_FOLDER = new Property(
+        "asset.folder",
+        "folder that contains all asset files"
+    );
+
+    public static final Property ASSET_IGNORE_HIDDEN = new Property(
+        "asset.ignore",
+        "Flag indicating if hidden asset resources should be ignored"
+    );
+
+    public static final Property BUILD_TIMESTAMP = new Property(
+        "build.timestamp",
+        "timestamp jbake was build");
+
+    public static final Property CLEAR_CACHE = new Property(
+        "db.clear.cache",
+        "clear database cache"
+    );
+
+    public static final Property CONTENT_FOLDER = new Property(
+        "content.folder",
+        "folder that contains all content files"
+    );
+
+    public static final Property DATA_FOLDER = new Property(
+        "data.folder",
+        "folder that contains all data files"
+    );
+
+    public static final Property DATA_FILE_DOCTYPE = new Property(
+        "data.file.docType",
+        "document type to use for data files"
+    );
+
+    public static final Property DATE_FORMAT = new Property(
+        "date.format",
+        "default date format used in content files"
+    );
+
+    public static final Property DB_STORE = new Property(
+        "db.store",
+        "database store (plocal, memory)"
+    );
+
+    public static final Property DB_PATH = new Property(
+        "db.path",
+        "database path for persistent storage"
+    );
+
+    public static final Property DEFAULT_STATUS = new Property(
+        "default.status",
+        "default document status"
+    );
+
+    public static final Property DEFAULT_TYPE = new Property(
+        "default.type",
+        "default document type"
+    );
+
+    public static final Property DESTINATION_FOLDER = new Property(
+        "destination.folder",
+        "path to destination folder by default"
+    );
+
+    public static final Property DRAFT_SUFFIX = new Property(
+        "draft.suffix",
+        "draft content suffix"
+    );
+
+    public static final Property ERROR404_FILE = new Property(
+        "error404.file",
+        "filename to use for 404 error"
+    );
+
+    public static final Property FEED_FILE = new Property(
+        "feed.file",
+        "filename to use for feed"
+    );
+
+    public static final Property FREEMARKER_TIMEZONE = new Property(
+        "freemarker.timezone",
+        "TimeZone to use within Freemarker"
+    );
+
+    public static final Property GIT_HASH = new Property(
+        "git.hash",
+        "abbreviated git hash"
+    );
+
+    public static final Property HEADER_SEPARATOR = new Property(
+        "header.separator",
+        "String used to separate the header from the body"
+    );
+
+    public static final Property IGNORE_FILE = new Property(
+        "ignore.file",
+        "file used to ignore a directory"
+    );
+
+    public static final Property IMG_PATH_UPDATE = new Property(
+        "img.path.update",
+        "update image path?"
+    );
+
+    public static final Property IMG_PATH_PREPEND_HOST = new Property(
+        "img.path.prepend.host",
+        "Prepend site.host to image paths"
+    );
+
+    public static final Property INDEX_FILE = new Property(
+        "index.file",
+        "filename to use for index file"
+    );
+
+    public static final Property JVM_LOCALE = new Property(
+        "jvm.locale",
+        "locale for the jvm"
+    );
+
+    public static final Property MARKDOWN_EXTENSIONS = new Property(
+        "markdown.extensions",
+        "comma delimited default markdown extensions; for available extensions: http://www.decodified.com/pegdown/api/org/pegdown/Extensions.html"
+    );
+
+    public static final Property OUTPUT_ENCODING = new Property(
+        "freemarker.outputencoding",
+        "default output_encoding setting for freemarker"
+    );
+
+    public static final Property OUTPUT_EXTENSION = new Property(
+        "output.extension",
+        "file extension for output content files"
+    );
+
+    public static final Property PAGINATE_INDEX = new Property(
+        "index.paginate",
+        "paginate index?"
+    );
+
+    public static final Property POSTS_PER_PAGE = new Property(
+        "index.posts_per_page",
+        "number of post per page for pagination"
+    );
+
+    public static final Property RENDER_ARCHIVE = new Property(
+        "render.archive",
+        "render archive file?"
+    );
+
+    public static final Property RENDER_ENCODING = new Property(
+        "render.encoding",
+        "character encoding MIME name used in templates. use one of http://www.iana.org/assignments/character-sets/character-sets.xhtml"
+    );
+
+    public static final Property RENDER_ERROR404 = new Property(
+        "render.error404",
+        "render 404 page?"
+    );
+
+    public static final Property RENDER_FEED = new Property(
+        "render.feed",
+        "render feed file?"
+    );
+
+    public static final Property RENDER_INDEX = new Property(
+        "render.index",
+        "render index file?"
+    );
+
+    public static final Property RENDER_SITEMAP = new Property(
+        "render.sitemap",
+        "render sitemap.xml file?"
+    );
+
+    public static final Property RENDER_TAGS = new Property(
+        "render.tags",
+        "render tag files?"
+    );
+
+    public static final Property RENDER_TAGS_INDEX = new Property(
+        "render.tagsindex",
+        "render tag index file?"
+    );
+
+    public static final Property SERVER_PORT = new Property(
+        "server.port",
+        "default server port"
+    );
+
+    public static final Property SERVER_HOSTNAME = new Property(
+        "server.hostname",
+        "default server hostname"
+    );
+
+    public static final Property SERVER_CONTEXT_PATH = new Property(
+        "server.contextPath",
+        "default server context path"
+    );
+
+    public static final Property SITE_HOST = new Property(
+        "site.host",
+        "site host"
+    );
+
+    public static final Property SITEMAP_FILE = new Property(
+        "sitemap.file",
+        "filename to use for sitemap file"
+    );
+
+    public static final Property TAG_SANITIZE = new Property(
+        "tag.sanitize",
+        "sanitize tag value before it is used as filename (i.e. replace spaces with hyphens)"
+    );
+
+    public static final Property TAG_PATH = new Property(
+        "tag.path",
+        "folder name to use for tag files"
+    );
+
+    public static final Property TEMPLATE_FOLDER = new Property(
+        "template.folder",
+        "folder that contains all template files"
+    );
+
+    public static final Property TEMPLATE_ENCODING = new Property(
+        "template.encoding",
+        "character encoding MIME name used in templates. use one of http://www.iana.org/assignments/character-sets/character-sets.xhtml"
+    );
+
+    public static final Property TEMPLATE_MASTERINDEX_FILE = new Property(
+        "template.masterindex.file",
+        "filename of masterindex template file"
+    );
+
+    public static final Property TEMPLATE_FEED_FILE = new Property(
+        "template.feed.file",
+        "filename of feed template file"
+    );
+
+    public static final Property TEMPLATE_ARCHIVE_FILE = new Property(
+        "template.archive.file",
+        "filename of archive template file"
+    );
+
+    public static final Property TEMPLATE_TAG_FILE = new Property(
+        "template.tag.file",
+        "filename of tag template file"
+    );
+
+    public static final Property TEMPLATE_TAGSINDEX_FILE = new Property(
+        "template.tagsindex.file",
+        "filename of tag index template file"
+    );
+
+    public static final Property TEMPLATE_SITEMAP_FILE = new Property(
+        "template.sitemap.file",
+        "filename of sitemap template file"
+    );
+
+    public static final Property TEMPLATE_POST_FILE = new Property(
+        "template.post.file",
+        "filename of post template file"
+    );
+
+    public static final Property TEMPLATE_PAGE_FILE = new Property(
+        "template.page.file",
+        "filename of page template file"
+    );
+
+    public static final Property EXAMPLE_PROJECT_FREEMARKER = new Property(
+        "example.project.freemarker",
+        "zip file containing example project structure using freemarker templates"
+    );
+
+    public static final Property EXAMPLE_PROJECT_GROOVY = new Property(
+        "example.project.groovy",
+        "zip file containing example project structure using groovy templates"
+    );
+
+    public static final Property EXAMPLE_PROJECT_GROOVY_MTE = new Property(
+        "example.project.groovy-mte",
+        "zip file containing example project structure using groovy markup templates"
+    );
+
+    public static final Property EXAMPLE_PROJECT_THYMELEAF = new Property(
+        "example.project.thymeleaf",
+        "zip file containing example project structure using thymeleaf templates"
+    );
+
+    public static final Property EXAMPLE_PROJECT_JADE = new Property(
+        "example.project.jade",
+        "zip file containing example project structure using jade templates"
+    );
+
+    public static final Property MARKDOWN_MAX_PARSINGTIME = new Property(
+        "markdown.maxParsingTimeInMillis",
+        "millis to parse single markdown page. See PegDown Parse configuration for details"
+    );
+
+    public static final Property THYMELEAF_LOCALE = new Property(
+        "thymeleaf.locale",
+        "default thymeleafe locale"
+    );
+
+    public static final Property URI_NO_EXTENSION = new Property(
+        "uri.noExtension",
+        "enable extension-less URI option?"
+    );
+
+    public static final Property URI_NO_EXTENSION_PREFIX = new Property(
+        "uri.noExtension.prefix",
+        "Set to a prefix path (starting with a slash) for which to generate extension-less URI's (i.e. a folder with index.html in)"
+    );
+
+    public static final Property VERSION = new Property(
+        "version",
+        "jbake application version"
+    );
+
+    private PropertyList() {
+    }
+
+    public static Property getPropertyByKey(String key) {
+
+        for (Field field : PropertyList.class.getFields()) {
+            try {
+                Property property = (Property) field.get(null);
+
+                if (property.getKey().equals(key)) {
+                    return property;
+                }
+            } catch (IllegalAccessException e) {
+                return new Property(key, "", CUSTOM);
+            }
+        }
+        return new Property(key, "", CUSTOM);
+    }
+}
diff --git a/jbake-core/src/main/java/org/jbake/launcher/BakeOff.java b/jbake-core/src/main/java/org/jbake/launcher/BakeOff.java
new file mode 100644
index 000000000..29bd60a29
--- /dev/null
+++ b/jbake-core/src/main/java/org/jbake/launcher/BakeOff.java
@@ -0,0 +1,10 @@
+package org.jbake.launcher;
+
+public final class BakeOff {
+
+    private BakeOff() {}
+
+    public static void exit(int status) {
+        System.exit(status);
+    }
+}
diff --git a/jbake-core/src/main/java/org/jbake/launcher/BakeWatcher.java b/jbake-core/src/main/java/org/jbake/launcher/BakeWatcher.java
index b6e2df1e8..3512cb83d 100644
--- a/jbake-core/src/main/java/org/jbake/launcher/BakeWatcher.java
+++ b/jbake-core/src/main/java/org/jbake/launcher/BakeWatcher.java
@@ -1,6 +1,6 @@
 package org.jbake.launcher;
 
-import org.apache.commons.configuration.CompositeConfiguration;
+import org.apache.commons.configuration2.CompositeConfiguration;
 import org.apache.commons.vfs2.FileObject;
 import org.apache.commons.vfs2.FileSystemException;
 import org.apache.commons.vfs2.FileSystemManager;
@@ -18,7 +18,7 @@
  */
 public class BakeWatcher {
 
-    private Logger logger = LoggerFactory.getLogger(BakeWatcher.class);
+    private final Logger logger = LoggerFactory.getLogger(BakeWatcher.class);
 
     /**
      * Starts watching the file system for changes to trigger a bake.
@@ -45,13 +45,15 @@ public void start(JBakeConfiguration config) {
             FileObject listenPath = fsMan.resolveFile(config.getContentFolder().toURI());
             FileObject templateListenPath = fsMan.resolveFile(config.getTemplateFolder().toURI());
             FileObject assetPath = fsMan.resolveFile(config.getAssetFolder().toURI());
+            FileObject dataPath = fsMan.resolveFile(config.getDataFolder().toURI());
 
-            logger.info("Watching for (content, template, asset) changes in [{}]", config.getSourceFolder().getPath());
+            logger.info("Watching for (content, data, template, asset) changes in [{}]", config.getSourceFolder().getPath());
             DefaultFileMonitor monitor = new DefaultFileMonitor(new CustomFSChangeListener(config));
             monitor.setRecursive(true);
             monitor.addFile(listenPath);
             monitor.addFile(templateListenPath);
             monitor.addFile(assetPath);
+            monitor.addFile(dataPath);
             monitor.start();
         } catch (FileSystemException e) {
             logger.error("Problems watching filesystem changes", e);
diff --git a/jbake-core/src/main/java/org/jbake/launcher/Baker.java b/jbake-core/src/main/java/org/jbake/launcher/Baker.java
index a1dcb373e..536625c98 100644
--- a/jbake-core/src/main/java/org/jbake/launcher/Baker.java
+++ b/jbake-core/src/main/java/org/jbake/launcher/Baker.java
@@ -1,6 +1,6 @@
 package org.jbake.launcher;
 
-import org.apache.commons.configuration.CompositeConfiguration;
+import org.apache.commons.configuration2.CompositeConfiguration;
 import org.jbake.app.JBakeException;
 import org.jbake.app.Oven;
 import org.jbake.app.configuration.JBakeConfiguration;
@@ -41,7 +41,7 @@ public void bake(final JBakeConfiguration config) {
                 msg.append(MessageFormat.format("{0}. {1}\n", errNr, error.getMessage()));
                 ++errNr;
             }
-            throw new JBakeException(msg.toString(), errors.get(0));
+            throw new JBakeException(SystemExit.ERROR ,msg.toString(), errors.get(0));
         }
     }
 }
diff --git a/jbake-core/src/main/java/org/jbake/launcher/CustomFSChangeListener.java b/jbake-core/src/main/java/org/jbake/launcher/CustomFSChangeListener.java
index bd8135b54..3c6006177 100644
--- a/jbake-core/src/main/java/org/jbake/launcher/CustomFSChangeListener.java
+++ b/jbake-core/src/main/java/org/jbake/launcher/CustomFSChangeListener.java
@@ -12,9 +12,9 @@
 
 public class CustomFSChangeListener implements FileListener {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(CustomFSChangeListener.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CustomFSChangeListener.class);
 
-    private JBakeConfiguration config;
+    private final JBakeConfiguration config;
 
     public CustomFSChangeListener(JBakeConfiguration config) {
         this.config = config;
@@ -22,20 +22,20 @@ public CustomFSChangeListener(JBakeConfiguration config) {
 
     @Override
     public void fileCreated(FileChangeEvent event) throws Exception {
-        LOGGER.info("File created event detected: {}", event.getFile().getURL());
-        exec(event.getFile());
+        LOGGER.info("File created event detected: {}", event.getFileObject().getURL());
+        exec(event.getFileObject());
     }
 
     @Override
     public void fileDeleted(FileChangeEvent event) throws Exception {
-        LOGGER.info("File deleted event detected: {}", event.getFile().getURL());
-        exec(event.getFile());
+        LOGGER.info("File deleted event detected: {}", event.getFileObject().getURL());
+        exec(event.getFileObject());
     }
 
     @Override
     public void fileChanged(FileChangeEvent event) throws Exception {
-        LOGGER.info("File changed event detected: {}", event.getFile().getURL());
-        exec(event.getFile());
+        LOGGER.info("File changed event detected: {}", event.getFileObject().getURL());
+        exec(event.getFileObject());
     }
 
     private void exec(FileObject file) {
diff --git a/jbake-core/src/main/java/org/jbake/launcher/Init.java b/jbake-core/src/main/java/org/jbake/launcher/Init.java
index 2a62f7875..ae1dd1bca 100644
--- a/jbake-core/src/main/java/org/jbake/launcher/Init.java
+++ b/jbake-core/src/main/java/org/jbake/launcher/Init.java
@@ -1,6 +1,6 @@
 package org.jbake.launcher;
 
-import org.apache.commons.configuration.CompositeConfiguration;
+import org.apache.commons.configuration2.CompositeConfiguration;
 import org.jbake.app.ZipUtil;
 import org.jbake.app.configuration.DefaultJBakeConfiguration;
 import org.jbake.app.configuration.JBakeConfiguration;
@@ -16,7 +16,7 @@
  */
 public class Init {
 
-    private JBakeConfiguration config;
+    private final JBakeConfiguration config;
 
     /**
      * @param config The project configuration
diff --git a/jbake-core/src/main/java/org/jbake/launcher/JettyServer.java b/jbake-core/src/main/java/org/jbake/launcher/JettyServer.java
index 8e00af26c..cff105932 100644
--- a/jbake-core/src/main/java/org/jbake/launcher/JettyServer.java
+++ b/jbake-core/src/main/java/org/jbake/launcher/JettyServer.java
@@ -7,6 +7,7 @@
 import org.eclipse.jetty.server.handler.DefaultHandler;
 import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.ResourceHandler;
+import org.jbake.app.JBakeException;
 import org.jbake.app.configuration.JBakeConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,41 +35,42 @@ public void run(String resourceBase, String port) {
     public void run(String resourceBase, JBakeConfiguration configuration) {
         run(resourceBase, configuration.getServerContextPath(), configuration.getServerHostname(), configuration.getServerPort());
     }
+
     /**
      * Run Jetty web server serving out supplied path on supplied port
      *
      * @param resourceBase Base directory for resources to be served
-     * @param port Required server port
+     * @param port         Required server port
      */
     private void run(String resourceBase, String contextPath, String hostname, int port) {
-        server = new Server();
-        ServerConnector connector = new ServerConnector(server);
-        connector.setHost(hostname);
-        connector.setPort(port);
-        server.addConnector(connector);
+        try {
+            server = new Server();
+            ServerConnector connector = new ServerConnector(server);
+            connector.setHost(hostname);
+            connector.setPort(port);
+            server.addConnector(connector);
 
-        ResourceHandler resource_handler = new ResourceHandler();
-        resource_handler.setDirectoriesListed(true);
-        resource_handler.setWelcomeFiles(new String[]{"index"});
-        resource_handler.setResourceBase(resourceBase);
+            ResourceHandler resource_handler = new ResourceHandler();
+            resource_handler.setDirectoriesListed(true);
+            resource_handler.setWelcomeFiles(new String[]{"index", "index.html"});
+            resource_handler.setResourceBase(resourceBase);
 
-        ContextHandler contextHandler = new ContextHandler();
-        contextHandler.setContextPath(contextPath);
-        contextHandler.setHandler(resource_handler);
+            ContextHandler contextHandler = new ContextHandler();
+            contextHandler.setContextPath(contextPath);
+            contextHandler.setHandler(resource_handler);
 
-        HandlerList handlers = new HandlerList();
+            HandlerList handlers = new HandlerList();
 
-        handlers.setHandlers(new Handler[]{contextHandler, new DefaultHandler()});
-        server.setHandler(handlers);
+            handlers.setHandlers(new Handler[]{contextHandler, new DefaultHandler()});
+            server.setHandler(handlers);
 
-        LOGGER.info("Serving out contents of: [{}] on http://{}:{}{}", resourceBase, hostname, port, contextHandler.getContextPath());
-        LOGGER.info("(To stop server hit CTRL-C)");
+            LOGGER.info("Serving out contents of: [{}] on http://{}:{}{}", resourceBase, hostname, port, contextHandler.getContextPath());
+            LOGGER.info("(To stop server hit CTRL-C)");
 
-        try {
             server.start();
             server.join();
         } catch (Exception e) {
-            LOGGER.error("unable to start server", e);
+            throw new JBakeException(SystemExit.SERVER_ERROR, "unable to start the server", e);
         }
     }
 
diff --git a/jbake-core/src/main/java/org/jbake/launcher/LaunchOptions.java b/jbake-core/src/main/java/org/jbake/launcher/LaunchOptions.java
index d30bd5865..c4bd9cfc2 100644
--- a/jbake-core/src/main/java/org/jbake/launcher/LaunchOptions.java
+++ b/jbake-core/src/main/java/org/jbake/launcher/LaunchOptions.java
@@ -1,41 +1,51 @@
 package org.jbake.launcher;
 
-import org.kohsuke.args4j.Argument;
-import org.kohsuke.args4j.Option;
+import org.jbake.app.configuration.ConfigUtil;
+import picocli.CommandLine.ArgGroup;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.Parameters;
 
 import java.io.File;
 
+@Command(
+    description = "JBake is a Java based, open source, static site/blog generator for developers & designers",
+    name = "jbake",
+    usageHelpAutoWidth = true
+)
 public class LaunchOptions {
-    @Argument(index = 0, usage = "source folder of site content (with templates and assets), if not supplied will default to current directory", metaVar = "<source>")
+    @Parameters(index = "0", description = "source folder of site content (with templates and assets), if not supplied will default to current directory", arity = "0..1")
     private String source;
 
-    @Argument(index = 1, usage = "destination folder for output, if not supplied will default to a folder called \"output\" in the current directory", metaVar = "<destination>")
+    @Parameters(index = "1", description = "destination folder for output, if not supplied will default to a folder called \"output\" in the current directory", arity = "0..1")
     private String destination;
 
-    @Option(name = "-b", aliases = {"--bake"}, usage = "performs a bake")
+    @Option(names = {"-b", "--bake"}, description = "performs a bake")
     private boolean bake;
 
-    @Option(name = "-i", aliases = {"--init"}, usage = "initialises required folder structure with default templates (defaults to current directory if <value> is not supplied)")
-    private boolean init;
+    @ArgGroup(exclusive = false, heading = "%n%nJBake initialization%n%n")
+    private InitOptions initGroup;
 
-    @Option(name = "-t", aliases = {"--template"}, usage = "use specified template engine for default templates (uses Freemarker if <value> is not supplied) ", depends = ("-i"))
-    private String template;
-
-    @Option(name = "-s", aliases = {"--server"}, usage = "runs HTTP server to serve out baked site, if no <value> is supplied will default to a folder called \"output\" in the current directory")
+    @Option(names = {"-s", "--server"}, description = "runs HTTP server to serve out baked site, if no <value> is supplied will default to a folder called \"output\" in the current directory")
     private boolean runServer;
 
-    @Option(name = "-h", aliases = {"--help"}, usage = "prints this message")
-    private boolean helpNeeded;
+    @Option(names = {"-h", "--help"}, description = "prints this message", usageHelp = true)
+    private boolean helpRequested;
 
-    @Option(name = "--reset", usage = "clears the local cache, enforcing rendering from scratch")
+    @Option(names = {"--reset"}, description = "clears the local cache, enforcing rendering from scratch")
     private boolean clearCache;
 
+    @Option(names = {"-c", "--config"}, description = "use specified file for configuration (defaults to " + ConfigUtil.CONFIG_FILE +" in the source folder if not supplied)")
+    private String config;
+
+    @Option(names = {"--prop-encoding"}, description = "use given encoding to load properties file. default: utf-8")
+    private String propertiesEncoding = "utf-8";
+
+    @Option(names = {"-ls", "--list-settings"}, description = "list configuration settings")
+    private boolean listConfig;
+
     public String getTemplate() {
-        if (template != null) {
-            return template;
-        } else {
-            return "freemarker";
-        }
+        return initGroup.template;
     }
 
     public File getSource() {
@@ -62,8 +72,20 @@ public String getDestinationValue() {
         return destination;
     }
 
+    public File getConfig() {
+        if (config != null) {
+            return new File(config);
+        } else {
+            return new File(getSource(), "jbake.properties");
+        }
+    }
+
+    public String getConfigValue() {
+        return config;
+    }
+
     public boolean isHelpNeeded() {
-        return helpNeeded || !(isBake() || isRunServer() || isInit() || source != null || destination != null);
+        return helpRequested || !(isListConfig() || isBake() || isRunServer() || isInit() || source != null || destination != null);
     }
 
     public boolean isRunServer() {
@@ -71,7 +93,7 @@ public boolean isRunServer() {
     }
 
     public boolean isInit() {
-        return init;
+        return (initGroup != null && initGroup.init);
     }
 
     public boolean isClearCache() {
@@ -81,4 +103,21 @@ public boolean isClearCache() {
     public boolean isBake() {
         return bake || (source != null && destination != null);
     }
+
+    public boolean isListConfig() {
+        return listConfig;
+    }
+
+    public String getPropertiesEncoding() {
+        return propertiesEncoding;
+    }
+
+    static class InitOptions {
+
+        @Option(names = {"-i", "--init"}, paramLabel = "<target>", description = "initialises required folder structure with default templates (defaults to current directory if <source> is not supplied)", required = true)
+        private boolean init;
+
+        @Option(names = {"-t", "--template"}, defaultValue = "freemarker", fallbackValue = "freemarker", description = "use specified template engine for default templates (uses Freemarker if <template> is not supplied) ", arity = "0..1")
+        private String template;
+    }
 }
diff --git a/jbake-core/src/main/java/org/jbake/launcher/Main.java b/jbake-core/src/main/java/org/jbake/launcher/Main.java
index ff643148c..30ee9beb9 100644
--- a/jbake-core/src/main/java/org/jbake/launcher/Main.java
+++ b/jbake-core/src/main/java/org/jbake/launcher/Main.java
@@ -1,18 +1,17 @@
 package org.jbake.launcher;
 
-import org.apache.commons.configuration.ConfigurationException;
 import org.jbake.app.FileUtil;
 import org.jbake.app.JBakeException;
 import org.jbake.app.configuration.JBakeConfiguration;
 import org.jbake.app.configuration.JBakeConfigurationFactory;
-import org.kohsuke.args4j.CmdLineException;
-import org.kohsuke.args4j.CmdLineParser;
+import org.jbake.util.ConfigurationPrinter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.bridge.SLF4JBridgeHandler;
+import picocli.CommandLine;
+import picocli.CommandLine.MissingParameterException;
 
 import java.io.File;
-import java.io.StringWriter;
 
 /**
  * Launcher for JBake.
@@ -21,8 +20,6 @@
  */
 public class Main {
 
-    private final String USAGE_PREFIX = "Usage: jbake";
-    private final String ALT_USAGE_PREFIX = "   or  jbake";
     private final Baker baker;
     private final JettyServer jettyServer;
     private final BakeWatcher watcher;
@@ -61,34 +58,38 @@ public static void main(final String[] args) {
         } catch (final JBakeException e) {
             logger.error(e.getMessage());
             logger.trace(e.getMessage(), e);
-            System.exit(1);
-        } catch (final Throwable e) {
-            logger.error("An unexpected error occurred: " + e.getMessage());
-            logger.trace(e.getMessage(), e);
-            System.exit(2);
+            if (e.getCause() instanceof MissingParameterException) {
+                Main.printUsage();
+            }
+            BakeOff.exit(e.getExit());
         }
     }
 
-    protected void run(String[] args) {
-        SLF4JBridgeHandler.removeHandlersForRootLogger();
-        SLF4JBridgeHandler.install();
-
-        final JBakeConfiguration config;
+    public void run(String[] args) throws JBakeException {
         try {
+            SLF4JBridgeHandler.removeHandlersForRootLogger();
+            SLF4JBridgeHandler.install();
+
+            final JBakeConfiguration config;
+
             LaunchOptions res = parseArguments(args);
             if (res.isRunServer()) {
-                config = getJBakeConfigurationFactory().createJettyJbakeConfiguration(res.getSource(), res.getDestination(), res.isClearCache());
+                config = getJBakeConfigurationFactory().setEncoding(res.getPropertiesEncoding()).createJettyJbakeConfiguration(res.getSource(), res.getDestination(), res.getConfig(), res.isClearCache());
             } else {
-                config = getJBakeConfigurationFactory().createDefaultJbakeConfiguration(res.getSource(), res.getDestination(), res.isClearCache());
+                config = getJBakeConfigurationFactory().setEncoding(res.getPropertiesEncoding()).createDefaultJbakeConfiguration(res.getSource(), res.getDestination(), res.getConfig(), res.isClearCache());
             }
             run(res, config);
-        } catch (final ConfigurationException e) {
-            throw new JBakeException("Configuration error: " + e.getMessage(), e);
+        } catch (final JBakeException e) {
+            throw e;
+        } catch (MissingParameterException mex) {
+            throw new JBakeException(SystemExit.CONFIGURATION_ERROR, mex.getMessage(), mex);
+        } catch (final Throwable e) {
+            throw new JBakeException(SystemExit.ERROR, "An unexpected error occurred: " + e.getMessage(), e);
         }
     }
 
     protected void run(LaunchOptions res, JBakeConfiguration config) {
-        System.out.println("JBake " + config.getVersion() + " (" + config.getBuildTimeStamp() + ") [http://jbake.org]");
+        System.out.println("JBake " + config.getVersion() + " (" + config.getBuildTimeStamp() + " " + config.getAbbreviatedGitHash()  + "#) [http://jbake.org]");
         System.out.println();
 
         if (res.isHelpNeeded()) {
@@ -97,6 +98,12 @@ protected void run(LaunchOptions res, JBakeConfiguration config) {
             return;
         }
 
+        if (res.isListConfig()) {
+            ConfigurationPrinter printer = new ConfigurationPrinter(config, System.out);
+            printer.print();
+            return;
+        }
+
         if (res.isBake()) {
             baker.bake(config);
         }
@@ -128,29 +135,17 @@ protected void run(LaunchOptions res, JBakeConfiguration config) {
     }
 
     private LaunchOptions parseArguments(String[] args) {
-        LaunchOptions res = new LaunchOptions();
-        CmdLineParser parser = new CmdLineParser(res);
-
-        try {
-            parser.parseArgument(args);
-        } catch (final CmdLineException e) {
-            printUsage(res);
-            throw new JBakeException("Invalid commandline arguments: " + e.getMessage(), e);
-        }
-
-        return res;
+        return CommandLine.populateCommand(new LaunchOptions(), args);
     }
 
     private void printUsage(Object options) {
-        CmdLineParser parser = new CmdLineParser(options);
-        StringWriter sw = new StringWriter();
-        sw.append(USAGE_PREFIX + "\n");
-        sw.append(ALT_USAGE_PREFIX + " <source> <destination>\n");
-        sw.append(ALT_USAGE_PREFIX + " [OPTION]... [<value>...]\n\n");
-        sw.append("Options:");
-        System.out.println(sw.toString());
-        parser.getProperties().withUsageWidth(100);
-        parser.printUsage(System.out);
+        CommandLine cli = new CommandLine(options);
+        cli.setUsageHelpLongOptionsMaxWidth(28);
+        cli.usage(System.out);
+    }
+
+    public static void printUsage() {
+        CommandLine.usage(new LaunchOptions(), System.out);
     }
 
     private void runServer(File path, JBakeConfiguration configuration) {
@@ -171,7 +166,7 @@ private void initStructure(String type, JBakeConfiguration config) {
             System.out.println("Base folder structure successfully created.");
         } catch (final Exception e) {
             final String msg = "Failed to initialise structure: " + e.getMessage();
-            throw new JBakeException(msg, e);
+            throw new JBakeException(SystemExit.INIT_ERROR, msg, e);
         }
     }
 
diff --git a/jbake-core/src/main/java/org/jbake/launcher/SystemExit.java b/jbake-core/src/main/java/org/jbake/launcher/SystemExit.java
new file mode 100644
index 000000000..0e7b3002f
--- /dev/null
+++ b/jbake-core/src/main/java/org/jbake/launcher/SystemExit.java
@@ -0,0 +1,13 @@
+package org.jbake.launcher;
+
+public enum SystemExit {
+    SUCCESS,
+    ERROR,
+    CONFIGURATION_ERROR,
+    INIT_ERROR,
+    SERVER_ERROR;
+
+    public int getStatus() {
+        return this.ordinal();
+    }
+}
diff --git a/jbake-core/src/main/java/org/jbake/model/BaseModel.java b/jbake-core/src/main/java/org/jbake/model/BaseModel.java
new file mode 100644
index 000000000..ebc246c97
--- /dev/null
+++ b/jbake-core/src/main/java/org/jbake/model/BaseModel.java
@@ -0,0 +1,18 @@
+package org.jbake.model;
+
+import java.util.HashMap;
+
+public abstract class BaseModel extends HashMap<String, Object> {
+
+    public String getUri() {
+        return (String) get(ModelAttributes.URI);
+    }
+
+    public void setUri(String uri) {
+        put(ModelAttributes.URI, uri);
+    }
+
+    public void setName(String name) {
+        put(ModelAttributes.NAME, name);
+    }
+}
diff --git a/jbake-core/src/main/java/org/jbake/model/DocumentAttributes.java b/jbake-core/src/main/java/org/jbake/model/DocumentAttributes.java
deleted file mode 100644
index ae698fb1c..000000000
--- a/jbake-core/src/main/java/org/jbake/model/DocumentAttributes.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.jbake.model;
-
-public enum DocumentAttributes {
-    SHA1("sha1"),
-    SOURCE_URI("sourceuri"),
-    RENDERED("rendered"),
-    CACHED("cached"),
-    STATUS("status"),
-    NAME("name");
-
-    private String label;
-
-    DocumentAttributes(String label) {
-        this.label = label;
-    }
-
-    @Override
-    public String toString() {
-        return label;
-    }
-}
diff --git a/jbake-core/src/main/java/org/jbake/model/DocumentModel.java b/jbake-core/src/main/java/org/jbake/model/DocumentModel.java
new file mode 100644
index 000000000..295f8c170
--- /dev/null
+++ b/jbake-core/src/main/java/org/jbake/model/DocumentModel.java
@@ -0,0 +1,140 @@
+package org.jbake.model;
+
+import org.jbake.app.DBUtil;
+
+import java.util.Date;
+
+public class DocumentModel extends BaseModel {
+
+    public static DocumentModel createDefaultDocumentModel() {
+        DocumentModel documentModel = new DocumentModel();
+        documentModel.setCached(true);
+        documentModel.setRendered(false);
+        return documentModel;
+    }
+
+    public String getBody() {
+        return get(ModelAttributes.BODY).toString();
+    }
+
+    public void setBody(String body) {
+        put(ModelAttributes.BODY, body);
+    }
+
+    public Date getDate() {
+        return (Date) get(ModelAttributes.DATE);
+    }
+
+    public void setDate(Date date) {
+        put(ModelAttributes.DATE, date);
+    }
+
+    public String getStatus() {
+        if (containsKey(ModelAttributes.STATUS)) {
+            return (String) get(ModelAttributes.STATUS);
+        }
+        return "";
+
+    }
+
+    public void setStatus(String status) {
+        put(ModelAttributes.STATUS, status);
+    }
+
+    public String getType() {
+        if (containsKey(ModelAttributes.TYPE)) {
+            return (String) get(ModelAttributes.TYPE);
+        }
+        return "";
+    }
+
+    public void setType(String type) {
+        put(ModelAttributes.TYPE, type);
+    }
+
+    public String[] getTags() {
+        return DBUtil.toStringArray(get(ModelAttributes.TAGS));
+    }
+
+    public void setTags(String[] tags) {
+        put(ModelAttributes.TAGS, tags);
+    }
+
+    public String getSha1() {
+        return (String) get(ModelAttributes.SHA1);
+    }
+
+    public void setSha1(String sha1) {
+        put(ModelAttributes.SHA1, sha1);
+    }
+
+    public String getSourceuri() {
+        return (String) get(ModelAttributes.SOURCE_URI);
+    }
+
+    public void setSourceUri(String uri) {
+        put(ModelAttributes.SOURCE_URI, uri);
+    }
+
+    public String getRootPath() {
+        return (String) get(ModelAttributes.ROOTPATH);
+    }
+
+    public void setRootPath(String pathToRoot) {
+        put(ModelAttributes.ROOTPATH, pathToRoot);
+    }
+
+    public Boolean getRendered() {
+        return (Boolean) getOrDefault(ModelAttributes.RENDERED, false);
+    }
+
+    public void setRendered(boolean rendered) {
+        put(ModelAttributes.RENDERED, rendered);
+    }
+
+    public String getFile() {
+        return (String) get(ModelAttributes.FILE);
+    }
+
+    public void setFile(String path) {
+        put(ModelAttributes.FILE, path);
+    }
+
+    public String getNoExtensionUri() {
+        return (String) get(ModelAttributes.NO_EXTENSION_URI);
+    }
+
+    public void setNoExtensionUri(String noExtensionUri) {
+        put(ModelAttributes.NO_EXTENSION_URI, noExtensionUri);
+    }
+
+    public String getTitle() {
+        return (String) get(ModelAttributes.TITLE);
+    }
+
+    public void setTitle(String title) {
+        put(ModelAttributes.TITLE, title);
+    }
+
+    public Boolean getCached() {
+
+        Object value = get(ModelAttributes.CACHED);
+        if ( value instanceof String ) {
+            return Boolean.valueOf((String) value);
+        } else {
+            return (Boolean) value;
+        }
+    }
+
+    public void setCached(boolean cached) {
+        put(ModelAttributes.CACHED, cached);
+    }
+
+    public void setNextContent(DocumentModel nextDocumentModel) {
+        put(ModelAttributes.NEXT_CONTENT, nextDocumentModel);
+    }
+
+    public void setPreviousContent(DocumentModel previousDocumentModel) {
+        put(ModelAttributes.PREVIOUS_CONTENT, previousDocumentModel);
+    }
+}
diff --git a/jbake-core/src/main/java/org/jbake/model/DocumentTypes.java b/jbake-core/src/main/java/org/jbake/model/DocumentTypes.java
index ff821a7e2..0ecc975ec 100644
--- a/jbake-core/src/main/java/org/jbake/model/DocumentTypes.java
+++ b/jbake-core/src/main/java/org/jbake/model/DocumentTypes.java
@@ -23,7 +23,8 @@ public class DocumentTypes {
         resetDocumentTypes();
     }
 
-    private DocumentTypes() {}
+    private DocumentTypes() {
+    }
 
     public static void resetDocumentTypes() {
         DEFAULT_DOC_TYPES.clear();
@@ -37,17 +38,18 @@ public static void addDocumentType(String docType) {
     }
 
     private static void notifyListener(String docType) {
-        for ( DocumentTypeListener listener : LISTENERS) {
+        for (DocumentTypeListener listener : LISTENERS) {
             listener.added(docType);
         }
     }
 
-    public static void addListener( DocumentTypeListener listener ) {
+    public static void addListener(DocumentTypeListener listener) {
         LISTENERS.add(listener);
     }
 
     /**
      * Notice additional document types are added automagically before returning them
+     *
      * @return all supported document types
      */
     public static String[] getDocumentTypes() {
diff --git a/jbake-core/src/main/java/org/jbake/model/ModelAttributes.java b/jbake-core/src/main/java/org/jbake/model/ModelAttributes.java
new file mode 100644
index 000000000..6fd910382
--- /dev/null
+++ b/jbake-core/src/main/java/org/jbake/model/ModelAttributes.java
@@ -0,0 +1,54 @@
+package org.jbake.model;
+
+public abstract class ModelAttributes {
+    public static final String SHA1 = "sha1";
+    public static final String SOURCE_URI = "sourceuri";
+    public static final String RENDERED = "rendered";
+    public static final String CACHED = "cached";
+    public static final String STATUS = "status";
+    public static final String NAME = "name";
+    public static final String BODY = "body";
+    public static final String DATE = "date";
+    public static final String TYPE = "type";
+    public static final String TAGS = "tags";
+    public static final String URI = "uri";
+    public static final String ROOTPATH = "rootpath";
+    public static final String FILE = "file";
+    public static final String NO_EXTENSION_URI = "noExtensionUri";
+    public static final String TITLE = "title";
+    public static final String TAGGED_POSTS = "tagged_posts";
+    public static final String TAGGED_DOCUMENTS = "tagged_documents";
+    public static final String NEXT_CONTENT = "nextContent";
+    public static final String PREVIOUS_CONTENT = "previousContent";
+    public static final String CONFIG = "config";
+    public static final String CONTENT = "content";
+    public static final String RENDERER = "renderer";
+    public static final String NUMBER_OF_PAGES = "numberOfPages";
+    public static final String CURRENT_PAGE_NUMBERS = "currentPageNumber";
+    public static final String PREVIOUS_FILENAME = "previousFileName";
+    public static final String NEXT_FILENAME = "nextFileName";
+    public static final String TAG = "tag";
+    public static final String VERSION = "version";
+    public static final String OUT = "out";
+    public static final String ALLTAGS = "alltags";
+    public static final String PUBLISHED_DATE = "published_date";
+    public static final String DB = "db";
+    public static final String DATA = "data";
+
+    private ModelAttributes() {
+    }
+
+    /**
+     * Possible values of the {@link ModelAttributes#STATUS} property
+     *
+     * @author ndx
+     */
+    public abstract static class Status {
+        public static final String PUBLISHED_DATE = "published-date";
+        public static final String PUBLISHED = "published";
+        public static final String DRAFT = "draft";
+
+        private Status() {
+        }
+    }
+}
diff --git a/jbake-core/src/main/java/org/jbake/parser/AsciidoctorEngine.java b/jbake-core/src/main/java/org/jbake/parser/AsciidoctorEngine.java
index 176d403c7..4ffc00234 100644
--- a/jbake-core/src/main/java/org/jbake/parser/AsciidoctorEngine.java
+++ b/jbake-core/src/main/java/org/jbake/parser/AsciidoctorEngine.java
@@ -1,13 +1,5 @@
 package org.jbake.parser;
 
-import org.asciidoctor.Asciidoctor;
-import org.asciidoctor.AttributesBuilder;
-import org.asciidoctor.Options;
-import org.asciidoctor.ast.DocumentHeader;
-import org.asciidoctor.jruby.AsciidoctorJRuby;
-import org.jbake.app.configuration.JBakeConfiguration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -19,8 +11,20 @@
 import java.util.Map;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import static org.asciidoctor.AttributesBuilder.attributes;
-import static org.asciidoctor.OptionsBuilder.options;
+import org.asciidoctor.Asciidoctor;
+import org.asciidoctor.Attributes;
+import org.asciidoctor.Options;
+import org.asciidoctor.ast.Document;
+import org.asciidoctor.jruby.AsciidoctorJRuby;
+import org.jbake.app.configuration.JBakeConfiguration;
+import org.jbake.model.DocumentModel;
+import org.jruby.RubyArray;
+import org.jruby.RubyBasicObject;
+import org.jruby.RubyString;
+import org.jruby.RubySymbol;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import static org.asciidoctor.SafeMode.UNSAFE;
 
 /**
@@ -87,15 +91,16 @@ private Asciidoctor getEngine(Options options) {
     public void processHeader(final ParserContext context) {
         Options options = getAsciiDocOptionsAndAttributes(context);
         final Asciidoctor asciidoctor = getEngine(options);
-        DocumentHeader header = asciidoctor.readDocumentHeader(context.getFile());
-        Map<String, Object> documentModel = context.getDocumentModel();
-        if (header.getDocumentTitle() != null) {
-            documentModel.put("title", header.getDocumentTitle().getCombined());
+        Document header = asciidoctor.loadFile(context.getFile(), options);
+        DocumentModel documentModel = context.getDocumentModel();
+        if (header.getDoctitle() != null) {
+            documentModel.setTitle(header.getDoctitle());
         }
         Map<String, Object> attributes = header.getAttributes();
         for (Map.Entry<String, Object> attribute : attributes.entrySet()) {
             String key = attribute.getKey();
-            Object value = attribute.getValue();
+            Object value = rubyAsJavaOrValue(attribute.getValue());
+
 
             if (hasJBakePrefix(key)) {
                 String pKey = key.substring(6);
@@ -123,7 +128,7 @@ public void processHeader(final ParserContext context) {
                     LOGGER.error("Wrong value of 'jbake-tags'. Expected a String got '{}'", getValueClassName(value));
                 }
             } else {
-                documentModel.put(key, attributes.get(key));
+                documentModel.put(key, value);
             }
         }
     }
@@ -132,6 +137,18 @@ private boolean canCastToString(Object value) {
         return value instanceof String;
     }
 
+    private Object rubyAsJavaOrValue(Object value) {
+        if (value instanceof RubyString) {
+            return ((RubyString) value).asJavaString();
+        } else if (value instanceof RubySymbol) {
+            return ((RubySymbol) value).asJavaString();
+        } else if (value instanceof RubyArray<?>) {
+            return ((RubyArray<?>) value).toArray();
+        } else {
+            return value;
+        }
+    }
+
     private String getValueClassName(Object value) {
         return (value == null) ? "null" : value.getClass().getCanonicalName();
     }
@@ -147,8 +164,8 @@ private boolean hasJBakePrefix(String key) {
     // TODO: write tests with options and attributes
     @Override
     public void processBody(ParserContext context) {
-        StringBuilder body = new StringBuilder(context.getBody().length());
         if (!context.hasHeader()) {
+            StringBuilder body = new StringBuilder(context.getBody().length());
             for (String line : context.getFileLines()) {
                 body.append(line).append("\n");
             }
@@ -166,20 +183,22 @@ private void processAsciiDoc(ParserContext context) {
     private Options getAsciiDocOptionsAndAttributes(ParserContext context) {
         JBakeConfiguration config = context.getConfig();
         List<String> asciidoctorAttributes = config.getAsciidoctorAttributes();
-        final AttributesBuilder attributes = attributes(asciidoctorAttributes.toArray(new String[0]));
+        Attributes attributes = Attributes.builder().build();
+        attributes.setAttributes(asciidoctorAttributes.toArray(new String[0]));
         if (config.getExportAsciidoctorAttributes()) {
             final String prefix = config.getAttributesExportPrefixForAsciidoctor();
 
             for (final Iterator<String> it = config.getKeys(); it.hasNext(); ) {
                 final String key = it.next();
                 if (!key.startsWith("asciidoctor")) {
-                    attributes.attribute(prefix + key.replace(".", "_"), config.get(key));
+                    attributes.setAttribute(prefix + key.replace(".", "_"), config.get(key));
                 }
             }
         }
 
         final List<String> optionsSubset = config.getAsciidoctorOptionKeys();
-        final Options options = options().attributes(attributes.get()).get();
+
+        final Options options = Options.builder().attributes(attributes).build();
         for (final String optionKey : optionsSubset) {
 
             Object optionValue = config.getAsciidoctorOption(optionKey);
diff --git a/jbake-core/src/main/java/org/jbake/parser/ErrorEngine.java b/jbake-core/src/main/java/org/jbake/parser/ErrorEngine.java
index bf654f6c8..b4d6051b2 100644
--- a/jbake-core/src/main/java/org/jbake/parser/ErrorEngine.java
+++ b/jbake-core/src/main/java/org/jbake/parser/ErrorEngine.java
@@ -1,9 +1,8 @@
 package org.jbake.parser;
 
-import org.jbake.app.Crawler.Attributes;
+import org.jbake.model.DocumentModel;
 
 import java.util.Date;
-import java.util.Map;
 
 /**
  * An internal rendering engine used to notify the user that the markup format he used requires an engine that couldn't
@@ -24,13 +23,12 @@ public ErrorEngine(final String name) {
 
     @Override
     public void processHeader(final ParserContext context) {
-        Map<String, Object> contents = context.getDocumentModel();
-        contents.put(Attributes.TYPE, "post");
-        contents.put(Attributes.STATUS, "published");
-        contents.put(Attributes.TITLE, "Rendering engine missing");
-        contents.put(Attributes.DATE, new Date());
-        contents.put(Attributes.TAGS, new String[0]);
-        contents.put(Attributes.ID, context.getFile().getName());
+        DocumentModel documentModel = context.getDocumentModel();
+        documentModel.setType("post");
+        documentModel.setStatus("published");
+        documentModel.setTitle("Rendering engine missing");
+        documentModel.setDate(new Date());
+        documentModel.setTags(new String[0]);
     }
 
     @Override
diff --git a/jbake-core/src/main/java/org/jbake/parser/MarkupEngine.java b/jbake-core/src/main/java/org/jbake/parser/MarkupEngine.java
index 8e1cab76a..e989b65b3 100644
--- a/jbake-core/src/main/java/org/jbake/parser/MarkupEngine.java
+++ b/jbake-core/src/main/java/org/jbake/parser/MarkupEngine.java
@@ -1,11 +1,12 @@
 package org.jbake.parser;
 
-import org.apache.commons.configuration.CompositeConfiguration;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.CompositeConfiguration;
+import org.apache.commons.configuration2.Configuration;
 import org.apache.commons.io.IOUtils;
-import org.jbake.app.Crawler;
 import org.jbake.app.configuration.DefaultJBakeConfiguration;
 import org.jbake.app.configuration.JBakeConfiguration;
+import org.jbake.model.DocumentModel;
+import org.jbake.model.ModelAttributes;
 import org.json.simple.JSONValue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -75,7 +76,7 @@ public Map<String, Object> parse(Configuration config, File file, String content
      * @param file file to process
      * @return a map containing all infos. Returning null indicates an error, even if an exception would be better.
      */
-    public Map<String, Object> parse(JBakeConfiguration config, File file) {
+    public DocumentModel parse(JBakeConfiguration config, File file) {
         this.configuration = config;
         List<String> fileContent = getFileContent(file, config.getRenderEncoding());
 
@@ -265,32 +266,35 @@ private void processDefaultHeader(ParserContext context) {
         }
     }
 
-    private void processHeaderLine(String line, Map<String, Object> content) {
+    private void processHeaderLine(String line, DocumentModel content) {
         String[] parts = line.split("=", 2);
         if (!line.isEmpty() && parts.length == 2) {
             storeHeaderValue(parts[0], parts[1], content);
         }
     }
 
-    void storeHeaderValue(String inputKey, String inputValue, Map<String, Object> content) {
+    void storeHeaderValue(String inputKey, String inputValue, DocumentModel content) {
         String key = sanitize(inputKey);
         String value = sanitize(inputValue);
 
-        if (key.equalsIgnoreCase(Crawler.Attributes.DATE)) {
+        if (key.equalsIgnoreCase(ModelAttributes.DATE)) {
             DateFormat df = new SimpleDateFormat(configuration.getDateFormat());
             try {
                 Date date = df.parse(value);
-                content.put(key, date);
+                content.setDate(date);
             } catch (ParseException e) {
                 LOGGER.error("unable to parse date {}", value);
             }
-        } else if (key.equalsIgnoreCase(Crawler.Attributes.TAGS)) {
-            content.put(key, getTags(value));
+        } else if (key.equalsIgnoreCase(ModelAttributes.TAGS)) {
+            content.setTags(getTags(value));
+        } else if (key.equalsIgnoreCase(ModelAttributes.CACHED)) {
+            content.setCached(Boolean.valueOf(value));
         } else if (isJson(value)) {
             content.put(key, JSONValue.parse(value));
         } else {
             content.put(key, value);
         }
+
     }
 
     private String sanitize(String part) {
diff --git a/jbake-core/src/main/java/org/jbake/parser/ParserContext.java b/jbake-core/src/main/java/org/jbake/parser/ParserContext.java
index 17a94f232..ce51d6412 100644
--- a/jbake-core/src/main/java/org/jbake/parser/ParserContext.java
+++ b/jbake-core/src/main/java/org/jbake/parser/ParserContext.java
@@ -1,20 +1,18 @@
 package org.jbake.parser;
 
-import org.jbake.app.Crawler;
 import org.jbake.app.configuration.JBakeConfiguration;
+import org.jbake.model.DocumentModel;
 
 import java.io.File;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 public class ParserContext {
     private final File file;
     private final List<String> fileLines;
     private final JBakeConfiguration config;
     private final boolean hasHeader;
-    private final Map<String,Object> documentModel;
+    private final DocumentModel documentModel;
 
     public ParserContext(
             File file,
@@ -25,7 +23,7 @@ public ParserContext(
         this.fileLines = fileLines;
         this.config = config;
         this.hasHeader = hasHeader;
-        this.documentModel = new HashMap<>();
+        this.documentModel = DocumentModel.createDefaultDocumentModel();
     }
 
     public File getFile() {
@@ -40,7 +38,7 @@ public JBakeConfiguration getConfig() {
         return config;
     }
 
-    public Map<String, Object> getDocumentModel() {
+    public DocumentModel getDocumentModel() {
         return documentModel;
     }
 
@@ -50,48 +48,48 @@ public boolean hasHeader() {
 
     // short methods for common use
     public String getBody() {
-        return documentModel.get(Crawler.Attributes.BODY).toString();
+        return documentModel.getBody();
     }
 
     public void setBody(String str) {
-        documentModel.put(Crawler.Attributes.BODY, str);
+        documentModel.setBody(str);
     }
 
-    public Object getDate() {
-        return getDocumentModel().get(Crawler.Attributes.DATE);
+    public Date getDate() {
+        return getDocumentModel().getDate();
     }
 
     public void setDate(Date date) {
-        getDocumentModel().put(Crawler.Attributes.DATE, date);
+        getDocumentModel().setDate(date);
     }
 
     public String getStatus() {
-        if (getDocumentModel().containsKey(Crawler.Attributes.STATUS)) {
-            return getDocumentModel().get(Crawler.Attributes.STATUS).toString();
+        if (getDocumentModel().getStatus() != null) {
+            return getDocumentModel().getStatus();
         }
         return "";
     }
 
     public void setDefaultStatus() {
-        getDocumentModel().put(Crawler.Attributes.STATUS, getConfig().getDefaultStatus());
+        getDocumentModel().setStatus(getConfig().getDefaultStatus());
     }
 
     public String getType() {
-        if (getDocumentModel().containsKey(Crawler.Attributes.TYPE)) {
-            return getDocumentModel().get(Crawler.Attributes.TYPE).toString();
+        if (getDocumentModel().getType() != null) {
+            return getDocumentModel().getType();
         }
         return "";
     }
 
     public void setDefaultType() {
-        getDocumentModel().put(Crawler.Attributes.TYPE, getConfig().getDefaultType());
+        getDocumentModel().setType(getConfig().getDefaultType());
     }
 
     public Object getTags() {
-        return getDocumentModel().get(Crawler.Attributes.TAGS);
+        return getDocumentModel().getTags();
     }
 
     public void setTags(String[] tags) {
-        getDocumentModel().put(Crawler.Attributes.TAGS, tags);
+        getDocumentModel().setTags(tags);
     }
 }
diff --git a/jbake-core/src/main/java/org/jbake/parser/ParserEngine.java b/jbake-core/src/main/java/org/jbake/parser/ParserEngine.java
index dcd24f5cb..302ba807b 100644
--- a/jbake-core/src/main/java/org/jbake/parser/ParserEngine.java
+++ b/jbake-core/src/main/java/org/jbake/parser/ParserEngine.java
@@ -1,7 +1,8 @@
 package org.jbake.parser;
 
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.Configuration;
 import org.jbake.app.configuration.JBakeConfiguration;
+import org.jbake.model.DocumentModel;
 
 import java.io.File;
 import java.util.Map;
@@ -11,15 +12,16 @@ public interface ParserEngine {
     /**
      * Parse a given file and transform to a model representation used by {@link MarkdownEngine} implementations
      * to render the file content.
+     *
      * @param config The project configuration
-     * @param file The file to be parsed
+     * @param file   The file to be parsed
      * @return A model representation of the given file
      */
-    Map<String, Object> parse(JBakeConfiguration config, File file);
+    DocumentModel parse(JBakeConfiguration config, File file);
 
     /**
-     * @param config The project configuration
-     * @param file The file to be parsed
+     * @param config      The project configuration
+     * @param file        The file to be parsed
      * @param contentPath unknown
      * @return A model representation of the given file
      * @deprecated use {@link #parse(JBakeConfiguration, File)} instead
diff --git a/jbake-core/src/main/java/org/jbake/parser/YamlEngine.java b/jbake-core/src/main/java/org/jbake/parser/YamlEngine.java
new file mode 100644
index 000000000..bf65a81cc
--- /dev/null
+++ b/jbake-core/src/main/java/org/jbake/parser/YamlEngine.java
@@ -0,0 +1,90 @@
+package org.jbake.parser;
+
+import org.apache.commons.io.IOUtils;
+import org.jbake.app.configuration.JBakeConfiguration;
+import org.jbake.model.DocumentModel;
+import org.jbake.model.DocumentTypes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.yaml.snakeyaml.Yaml;
+
+import javax.swing.text.Document;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class YamlEngine extends MarkupEngine {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(YamlEngine.class);
+
+    public static final String JBAKE_PREFIX = "jbake-";
+
+    /**
+     * Parses the YAML file and ensures the output is always a Map.
+     *
+     * @param file
+     * @return
+     */
+    private DocumentModel parseFile(File file) {
+        DocumentModel model = new DocumentModel();
+        Yaml yaml = new Yaml();
+        try (InputStream is = new FileInputStream(file)) {
+            Object result = yaml.load(is);
+            if (result instanceof List) {
+                model.put("data", result);
+            } else if (result instanceof Map) {
+                model.putAll((Map)result);
+            } else {
+                LOGGER.warn("Unexpected result [{}] while parsing YAML file {}", result.getClass(), file);
+            }
+        } catch (IOException e) {
+            LOGGER.error("Error while parsing YAML file {}", file, e);
+        }
+        return model;
+    }
+
+    @Override
+    public DocumentModel parse(JBakeConfiguration config, File file) {
+        return parseFile(file);
+    }
+
+    /**
+     * This method implements the contract allowing use of Yaml files as content files
+     *
+     * @param context the parser context
+     */
+    @Override
+    public void processHeader(final ParserContext context) {
+        DocumentModel fileContents = parseFile(context.getFile());
+        DocumentModel documentModel = context.getDocumentModel();
+
+        for (String key : fileContents.keySet()) {
+            if (hasJBakePrefix(key)) {
+                String pKey = key.substring(6);
+                documentModel.put(pKey, fileContents.get(key));
+            } else {
+                documentModel.put(key, fileContents.get(key));
+            }
+        }
+    }
+
+    /**
+     * This method implements the contract allowing use of Yaml files as content files. As such there is
+     * no body for Yaml files so this method just sets an empty String as the body.
+     *
+     * @param context the parser context
+     */
+    @Override
+    public void processBody(ParserContext context) {
+        context.setBody("");
+    }
+
+    private boolean hasJBakePrefix(String key) {
+        return key.startsWith(JBAKE_PREFIX);
+    }
+}
diff --git a/jbake-core/src/main/java/org/jbake/render/ArchiveRenderer.java b/jbake-core/src/main/java/org/jbake/render/ArchiveRenderer.java
index b13d227fb..397fa5bf1 100644
--- a/jbake-core/src/main/java/org/jbake/render/ArchiveRenderer.java
+++ b/jbake-core/src/main/java/org/jbake/render/ArchiveRenderer.java
@@ -1,6 +1,6 @@
 package org.jbake.render;
 
-import org.apache.commons.configuration.CompositeConfiguration;
+import org.apache.commons.configuration2.CompositeConfiguration;
 import org.jbake.app.ContentStore;
 import org.jbake.app.Renderer;
 import org.jbake.app.configuration.JBakeConfiguration;
diff --git a/jbake-core/src/main/java/org/jbake/render/DocumentsRenderer.java b/jbake-core/src/main/java/org/jbake/render/DocumentsRenderer.java
index 78a4a4760..066c89d7f 100644
--- a/jbake-core/src/main/java/org/jbake/render/DocumentsRenderer.java
+++ b/jbake-core/src/main/java/org/jbake/render/DocumentsRenderer.java
@@ -1,19 +1,17 @@
 package org.jbake.render;
 
-import org.apache.commons.configuration.CompositeConfiguration;
+import org.apache.commons.configuration2.CompositeConfiguration;
 import org.jbake.app.ContentStore;
-import org.jbake.app.Crawler.Attributes;
 import org.jbake.app.DocumentList;
 import org.jbake.app.Renderer;
 import org.jbake.app.configuration.JBakeConfiguration;
-import org.jbake.model.DocumentTypes;
+import org.jbake.model.DocumentModel;
+import org.jbake.model.ModelAttributes;
 import org.jbake.template.RenderingException;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 
 public class DocumentsRenderer implements RenderingTool {
 
@@ -21,46 +19,25 @@ public class DocumentsRenderer implements RenderingTool {
     public int render(Renderer renderer, ContentStore db, JBakeConfiguration config) throws RenderingException {
         int renderedCount = 0;
         final List<String> errors = new LinkedList<>();
-        for (String docType : DocumentTypes.getDocumentTypes()) {
-            DocumentList documentList = db.getUnrenderedContent(docType);
 
-            if (documentList == null) {
-                continue;
+        DocumentList<DocumentModel> documentList = db.getUnrenderedContent();
+        for (DocumentModel document : documentList) {
+            try {
+                DocumentList<DocumentModel> typedDocList = db.getAllContent(document.getType());
+                DocumentModel prev = getPrevDoc(typedDocList, document);
+                DocumentModel next = getNextDoc(typedDocList, document);
+                document.setPreviousContent(prev);
+                document.setNextContent(next);
+
+                renderer.render(document);
+                db.markContentAsRendered(document);
+                renderedCount++;
+
+            } catch (Exception e) {
+                errors.add(e.getMessage());
             }
-
-            int index = 0;
-
-            Map<String, Object> nextDocument = null;
-
-            while (index < documentList.size()) {
-                try {
-                    Map<String, Object> document = documentList.get(index);
-                    document.put("nextContent", null);
-                    document.put("previousContent", null);
-
-                    if (index > 0) {
-                        document.put("nextContent", getContentForNav(nextDocument));
-                    }
-
-                    if (index < documentList.size() - 1) {
-                        Map<String, Object> tempNext = documentList.get(index + 1);
-                        document.put("previousContent", getContentForNav(tempNext));
-                    }
-
-                    nextDocument = document;
-
-                    renderer.render(document);
-                    renderedCount++;
-
-                } catch (Exception e) {
-                    errors.add(e.getMessage());
-                }
-
-                index++;
-            }
-
-            db.markContentAsRendered(docType);
         }
+
         if (!errors.isEmpty()) {
             StringBuilder sb = new StringBuilder();
             sb.append("Failed to render documents. Cause(s):");
@@ -73,17 +50,65 @@ public int render(Renderer renderer, ContentStore db, JBakeConfiguration config)
         }
     }
 
+    private DocumentModel getNextDoc(DocumentList<DocumentModel> typedList, DocumentModel doc) {
+        int typedListIndex = typedList.indexOf(doc);
+        if (typedList.getFirst().equals(doc)) {
+            // initial doc in typed list so there is no next
+            return null;
+        } else {
+            while (true) {
+                try {
+                    DocumentModel nextDoc = typedList.get(typedListIndex - 1);
+                    if (isPublished(nextDoc)) {
+                        return getContentForNav(nextDoc);
+                    } else {
+                        typedListIndex--;
+                    }
+                } catch (IndexOutOfBoundsException ex) {
+                    return null;
+                }
+            }
+        }
+    }
+
+    private DocumentModel getPrevDoc(DocumentList<DocumentModel> typedList, DocumentModel doc) {
+        int typedListIndex = typedList.indexOf(doc);
+        if (typedList.getLast().equals(doc)) {
+            // last doc in typed list so there is no previous
+            return null;
+        } else {
+            while (true) {
+                try {
+                    DocumentModel prevDoc = typedList.get(typedListIndex + 1);
+                    if (isPublished(prevDoc)) {
+                        return getContentForNav(prevDoc);
+                    } else {
+                        typedListIndex++;
+                    }
+                } catch (IndexOutOfBoundsException ex) {
+                    return null;
+                }
+            }
+        }
+    }
+
+    private boolean isPublished(DocumentModel document) {
+        // Attributes.Status.PUBLISHED_DATE cannot occur here
+        // because it's converted TO either PUBLISHED or DRAFT in the Crawler.
+        return ModelAttributes.Status.PUBLISHED.equals(document.getStatus());
+    }
+
     /**
      * Creates a simple content model to use in individual post navigations.
      *
-     * @param document
-     * @return
+     * @param document original
+     * @return navigation model for the 'document'
      */
-    private Map<String, Object> getContentForNav(Map<String, Object> document) {
-        Map<String, Object> navDocument = new HashMap<>();
-        navDocument.put(Attributes.NO_EXTENSION_URI, document.get(Attributes.NO_EXTENSION_URI));
-        navDocument.put(Attributes.URI, document.get(Attributes.URI));
-        navDocument.put(Attributes.TITLE, document.get(Attributes.TITLE));
+    private DocumentModel getContentForNav(DocumentModel document) {
+        DocumentModel navDocument = new DocumentModel();
+        navDocument.setNoExtensionUri(document.getNoExtensionUri());
+        navDocument.setUri(document.getUri());
+        navDocument.setTitle(document.getTitle());
         return navDocument;
     }
 
diff --git a/jbake-core/src/main/java/org/jbake/render/Error404Renderer.java b/jbake-core/src/main/java/org/jbake/render/Error404Renderer.java
new file mode 100644
index 000000000..fd2eb4a57
--- /dev/null
+++ b/jbake-core/src/main/java/org/jbake/render/Error404Renderer.java
@@ -0,0 +1,34 @@
+package org.jbake.render;
+
+import java.io.File;
+
+import org.apache.commons.configuration2.CompositeConfiguration;
+import org.jbake.app.ContentStore;
+import org.jbake.app.Renderer;
+import org.jbake.app.configuration.JBakeConfiguration;
+import org.jbake.app.configuration.JBakeConfigurationFactory;
+import org.jbake.template.RenderingException;
+
+
+public class Error404Renderer implements RenderingTool {
+
+    @Override
+    public int render(Renderer renderer, ContentStore db, JBakeConfiguration config) throws RenderingException {
+        if (config.getRenderError404()) {
+            try {
+                renderer.renderError404(config.getError404FileName());
+                return 1;
+            } catch (Exception e) {
+                throw new RenderingException(e);
+            }
+        } else {
+            return 0;
+        }
+    }
+
+    @Override
+    public int render(Renderer renderer, ContentStore db, File destination, File templatesPath, CompositeConfiguration config) throws RenderingException {
+        JBakeConfiguration configuration = new JBakeConfigurationFactory().createDefaultJbakeConfiguration(templatesPath.getParentFile(), config);
+        return render(renderer, db, configuration);
+    }
+}
diff --git a/jbake-core/src/main/java/org/jbake/render/FeedRenderer.java b/jbake-core/src/main/java/org/jbake/render/FeedRenderer.java
index ffc20c49f..cd4ffcbeb 100644
--- a/jbake-core/src/main/java/org/jbake/render/FeedRenderer.java
+++ b/jbake-core/src/main/java/org/jbake/render/FeedRenderer.java
@@ -1,6 +1,6 @@
 package org.jbake.render;
 
-import org.apache.commons.configuration.CompositeConfiguration;
+import org.apache.commons.configuration2.CompositeConfiguration;
 import org.jbake.app.ContentStore;
 import org.jbake.app.Renderer;
 import org.jbake.app.configuration.JBakeConfiguration;
diff --git a/jbake-core/src/main/java/org/jbake/render/IndexRenderer.java b/jbake-core/src/main/java/org/jbake/render/IndexRenderer.java
index 2d9f337a3..b5b05a870 100644
--- a/jbake-core/src/main/java/org/jbake/render/IndexRenderer.java
+++ b/jbake-core/src/main/java/org/jbake/render/IndexRenderer.java
@@ -1,6 +1,6 @@
 package org.jbake.render;
 
-import org.apache.commons.configuration.CompositeConfiguration;
+import org.apache.commons.configuration2.CompositeConfiguration;
 import org.jbake.app.ContentStore;
 import org.jbake.app.Renderer;
 import org.jbake.app.configuration.JBakeConfiguration;
diff --git a/jbake-core/src/main/java/org/jbake/render/RenderingTool.java b/jbake-core/src/main/java/org/jbake/render/RenderingTool.java
index 3b483ec7f..3417406b8 100644
--- a/jbake-core/src/main/java/org/jbake/render/RenderingTool.java
+++ b/jbake-core/src/main/java/org/jbake/render/RenderingTool.java
@@ -1,6 +1,6 @@
 package org.jbake.render;
 
-import org.apache.commons.configuration.CompositeConfiguration;
+import org.apache.commons.configuration2.CompositeConfiguration;
 import org.jbake.app.ContentStore;
 import org.jbake.app.Renderer;
 import org.jbake.app.configuration.JBakeConfiguration;
diff --git a/jbake-core/src/main/java/org/jbake/render/SitemapRenderer.java b/jbake-core/src/main/java/org/jbake/render/SitemapRenderer.java
index 37bf5ea30..3d3525fa3 100644
--- a/jbake-core/src/main/java/org/jbake/render/SitemapRenderer.java
+++ b/jbake-core/src/main/java/org/jbake/render/SitemapRenderer.java
@@ -1,6 +1,6 @@
 package org.jbake.render;
 
-import org.apache.commons.configuration.CompositeConfiguration;
+import org.apache.commons.configuration2.CompositeConfiguration;
 import org.jbake.app.ContentStore;
 import org.jbake.app.Renderer;
 import org.jbake.app.configuration.JBakeConfiguration;
diff --git a/jbake-core/src/main/java/org/jbake/render/TagsRenderer.java b/jbake-core/src/main/java/org/jbake/render/TagsRenderer.java
index 8cc048f38..41b70bc1b 100644
--- a/jbake-core/src/main/java/org/jbake/render/TagsRenderer.java
+++ b/jbake-core/src/main/java/org/jbake/render/TagsRenderer.java
@@ -1,6 +1,6 @@
 package org.jbake.render;
 
-import org.apache.commons.configuration.CompositeConfiguration;
+import org.apache.commons.configuration2.CompositeConfiguration;
 import org.jbake.app.ContentStore;
 import org.jbake.app.Renderer;
 import org.jbake.app.configuration.JBakeConfiguration;
diff --git a/jbake-core/src/main/java/org/jbake/template/AbstractTemplateEngine.java b/jbake-core/src/main/java/org/jbake/template/AbstractTemplateEngine.java
index aaa630032..479f0a127 100644
--- a/jbake-core/src/main/java/org/jbake/template/AbstractTemplateEngine.java
+++ b/jbake-core/src/main/java/org/jbake/template/AbstractTemplateEngine.java
@@ -1,28 +1,28 @@
 package org.jbake.template;
 
-import org.apache.commons.configuration.CompositeConfiguration;
-import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration2.CompositeConfiguration;
+import org.apache.commons.configuration2.Configuration;
 import org.jbake.app.ContentStore;
 import org.jbake.app.configuration.JBakeConfiguration;
 import org.jbake.app.configuration.JBakeConfigurationFactory;
+import org.jbake.template.model.TemplateModel;
 
 import java.io.File;
 import java.io.Writer;
-import java.util.Map;
 
 
 /**
  * A template is responsible for converting a model into a rendered document. The model
  * consists of key/value pairs, some of them potentially converted from a markup language
  * to HTML already.
- *
+ * <p>
  * An appropriate rendering engine will be chosen by JBake based on the template suffix. If
  * contents is not available in the supplied model, a template has access to the document
  * database in order to complete the model. It is in particular interesting to optimize
  * data access based on the underlying template engine capabilities.
- *
+ * <p>
  * Note that some rendering engines may rely on a different rendering model than the one
- * provided by the first argument of {@link #renderDocument(java.util.Map, String, java.io.Writer)}.
+ * provided by the first argument of {@link #renderDocument(TemplateModel, String, Writer)}.
  * In this case, it is the responsibility of the engine to convert it.
  *
  * @author Cédric Champeau
@@ -33,9 +33,12 @@ public abstract class AbstractTemplateEngine {
     protected final JBakeConfiguration config;
     protected final ContentStore db;
 
+    /**
+     * @deprecated use {@link AbstractTemplateEngine(JBakeConfiguration,ContentStore)} instead
+     */
     @Deprecated
     protected AbstractTemplateEngine(final Configuration config, final ContentStore db, final File destination, final File templatesPath) {
-        this(new JBakeConfigurationFactory().createDefaultJbakeConfiguration(templatesPath.getParentFile(),destination, (CompositeConfiguration) config),db);
+        this(new JBakeConfigurationFactory().createDefaultJbakeConfiguration(templatesPath.getParentFile(), destination, (CompositeConfiguration) config), db);
     }
 
     protected AbstractTemplateEngine(final JBakeConfiguration config, final ContentStore db) {
@@ -43,5 +46,5 @@ protected AbstractTemplateEngine(final JBakeConfiguration config, final ContentS
         this.db = db;
     }
 
-    public abstract void renderDocument(Map<String,Object> model, String templateName, Writer writer) throws RenderingException;
+    public abstract void renderDocument(TemplateModel model, String templateName, Writer writer) throws RenderingException;
 }
diff --git a/jbake-core/src/main/java/org/jbake/template/DelegatingTemplateEngine.java b/jbake-core/src/main/java/org/jbake/template/DelegatingTemplateEngine.java
index a006c51ab..cd9ecae16 100644
--- a/jbake-core/src/main/java/org/jbake/template/DelegatingTemplateEngine.java
+++ b/jbake-core/src/main/java/org/jbake/template/DelegatingTemplateEngine.java
@@ -1,18 +1,17 @@
 package org.jbake.template;
 
-import org.apache.commons.configuration.CompositeConfiguration;
+import org.apache.commons.configuration2.CompositeConfiguration;
 import org.jbake.app.ContentStore;
 import org.jbake.app.FileUtil;
 import org.jbake.app.configuration.JBakeConfiguration;
-import org.jbake.app.configuration.JBakeProperty;
+import org.jbake.template.model.TemplateModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.Writer;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
+
+import static org.jbake.app.configuration.PropertyList.PAGINATE_INDEX;
 
 /**
  * A template which is responsible for delegating to a supported template engine,
@@ -45,28 +44,14 @@ public DelegatingTemplateEngine(final ContentStore db, final JBakeConfiguration
     }
 
     @Override
-    public void renderDocument(final Map<String, Object> model, String templateName, final Writer writer) throws RenderingException {
-        model.put("version", config.getVersion());
-
-        // TODO: create config model from configuration
-        Map<String, Object> configModel = new HashMap<>();
-        Iterator<String> configKeys = config.getKeys();
-        while (configKeys.hasNext()) {
-            String key = configKeys.next();
-            Object valueObject;
+    public void renderDocument(final TemplateModel model, final String templateName, final Writer writer) throws RenderingException {
+        model.setVersion(config.getVersion());
+        model.setConfig(config.asHashMap());
 
-            if ( key.equals(JBakeProperty.PAGINATE_INDEX) ){
-                valueObject = config.getPaginateIndex();
-            } else {
-                valueObject = config.get(key);
-            }
-            //replace "." in key so you can use dot notation in templates
-            configModel.put(key.replace(".", "_"), valueObject);
-        }
-        model.put("config", configModel);
         // if default template exists we will use it
         File templateFolder = config.getTemplateFolder();
         File templateFile = new File(templateFolder, templateName);
+        String theTemplateName = templateName;
         if (!templateFile.exists()) {
             LOGGER.info("Default template: {} was not found, searching for others...", templateName);
             // if default template does not exist then check if any alternative engine templates exist
@@ -75,17 +60,17 @@ public void renderDocument(final Map<String, Object> model, String templateName,
                 templateFile = new File(templateFolder, templateNameWithoutExt + "." + extension);
                 if (templateFile.exists()) {
                     LOGGER.info("Found alternative template file: {} using this instead", templateFile.getName());
-                    templateName = templateFile.getName();
+                    theTemplateName = templateFile.getName();
                     break;
                 }
             }
         }
-        String ext = FileUtil.fileExt(templateName);
+        String ext = FileUtil.fileExt(theTemplateName);
         AbstractTemplateEngine engine = renderers.getEngine(ext);
         if (engine != null) {
-            engine.renderDocument(model, templateName, writer);
+            engine.renderDocument(model, theTemplateName, writer);
         } else {
-            LOGGER.error("Warning - No template engine found for template: {}", templateName);
+            LOGGER.error("Warning - No template engine found for template: {}", theTemplateName);
         }
     }
 }
diff --git a/jbake-core/src/main/java/org/jbake/template/FreemarkerTemplateEngine.java b/jbake-core/src/main/java/org/jbake/template/FreemarkerTemplateEngine.java
index 43c1e2158..2935e067e 100644
--- a/jbake-core/src/main/java/org/jbake/template/FreemarkerTemplateEngine.java
+++ b/jbake-core/src/main/java/org/jbake/template/FreemarkerTemplateEngine.java
@@ -13,19 +13,19 @@
 import freemarker.template.TemplateDateModel;
 import freemarker.template.TemplateException;
 import freemarker.template.TemplateHashModel;
-import freemarker.template.TemplateModel;
 import freemarker.template.TemplateModelException;
-import org.apache.commons.configuration.CompositeConfiguration;
+import org.apache.commons.configuration2.CompositeConfiguration;
 import org.jbake.app.ContentStore;
-import org.jbake.app.Crawler;
 import org.jbake.app.configuration.JBakeConfiguration;
+import org.jbake.model.ModelAttributes;
+import org.jbake.template.model.TemplateModel;
+import org.jbake.util.DataFileUtil;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Collection;
 import java.util.Date;
-import java.util.Map;
 
 /**
  * Renders pages using the <a href="http://freemarker.org/">Freemarker</a> template engine.
@@ -50,6 +50,11 @@ public FreemarkerTemplateEngine(final JBakeConfiguration config, final ContentSt
     private void createTemplateConfiguration() {
         templateCfg = new Configuration(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS);
         templateCfg.setDefaultEncoding(config.getRenderEncoding());
+        templateCfg.setOutputEncoding(config.getOutputEncoding());
+        if (config.getFreemarkerTimeZone() != null) {
+            templateCfg.setTimeZone(config.getFreemarkerTimeZone());
+            templateCfg.setSQLDateAndTimeTimeZone(config.getFreemarkerTimeZone());
+        }
         try {
             templateCfg.setDirectoryForTemplateLoading(config.getTemplateFolder());
         } catch (IOException e) {
@@ -58,13 +63,11 @@ private void createTemplateConfiguration() {
     }
 
     @Override
-    public void renderDocument(final Map<String, Object> model, final String templateName, final Writer writer) throws RenderingException {
+    public void renderDocument(final TemplateModel model, final String templateName, final Writer writer) throws RenderingException {
         try {
             Template template = templateCfg.getTemplate(templateName);
-            template.process(new LazyLoadingModel(templateCfg.getObjectWrapper(), model, db), writer);
-        } catch (IOException e) {
-            throw new RenderingException(e);
-        } catch (TemplateException e) {
+            template.process(new LazyLoadingModel(templateCfg.getObjectWrapper(), model, db, config), writer);
+        } catch (IOException | TemplateException e) {
             throw new RenderingException(e);
         }
     }
@@ -76,34 +79,40 @@ public static class LazyLoadingModel implements TemplateHashModel {
         private final ObjectWrapper wrapper;
         private final SimpleHash eagerModel;
         private final ContentStore db;
+        private final JBakeConfiguration config;
 
-        public LazyLoadingModel(ObjectWrapper wrapper, Map<String, Object> eagerModel, final ContentStore db) {
+        public LazyLoadingModel(ObjectWrapper wrapper, TemplateModel eagerModel, final ContentStore db, JBakeConfiguration config) {
             this.eagerModel = new SimpleHash(eagerModel, wrapper);
             this.db = db;
             this.wrapper = wrapper;
+            this.config = config;
         }
 
         @Override
-        public TemplateModel get(final String key) throws TemplateModelException {
+        public freemarker.template.TemplateModel get(final String key) throws TemplateModelException {
             try {
 
                 // GIT Issue#357: Accessing db in freemarker template throws exception
                 // When content store is accessed with key "db" then wrap the ContentStore with BeansWrapper and return to template.
                 // All methods on db are then accessible in template. Eg: ${db.getPublishedPostsByTag(tagName).size()}
-                if(key.equals(Crawler.Attributes.DB)) {
+                if (key.equals(ModelAttributes.DB)) {
                     BeansWrapperBuilder bwb = new BeansWrapperBuilder(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS);
                     BeansWrapper bw = bwb.build();
                     return bw.wrap(db);
                 }
+                if (key.equals(ModelAttributes.DATA)) {
+                    BeansWrapperBuilder bwb = new BeansWrapperBuilder(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS);
+                    BeansWrapper bw = bwb.build();
+                    return bw.wrap(new DataFileUtil(db, config.getDataFileDocType()));
+                }
 
-
-                return extractors.extractAndTransform(db, key, eagerModel.toMap(), new TemplateEngineAdapter<TemplateModel>() {
+                return extractors.extractAndTransform(db, key, eagerModel.toMap(), new TemplateEngineAdapter<freemarker.template.TemplateModel>() {
 
                     @Override
-                    public TemplateModel adapt(String key, Object extractedValue) {
-                        if(key.equals(Crawler.Attributes.ALLTAGS)) {
+                    public freemarker.template.TemplateModel adapt(String key, Object extractedValue) {
+                        if (key.equals(ModelAttributes.ALLTAGS)) {
                             return new SimpleCollection((Collection) extractedValue, wrapper);
-                        } else if(key.equals(Crawler.Attributes.PUBLISHED_DATE)) {
+                        } else if (key.equals(ModelAttributes.PUBLISHED_DATE)) {
                             return new SimpleDate((Date) extractedValue, TemplateDateModel.UNKNOWN);
                         } else {
                             // All other cases, as far as I know, are document collections
@@ -112,13 +121,13 @@ public TemplateModel adapt(String key, Object extractedValue) {
 
                     }
                 });
-            } catch(NoModelExtractorException e) {
+            } catch (NoModelExtractorException e) {
                 return eagerModel.get(key);
             }
         }
 
         @Override
-        public boolean isEmpty() throws TemplateModelException {
+        public boolean isEmpty() {
             return false;
         }
 
diff --git a/jbake-core/src/main/java/org/jbake/template/GroovyMarkupTemplateEngine.java b/jbake-core/src/main/java/org/jbake/template/GroovyMarkupTemplateEngine.java
index f46b25ce5..103786ec1 100644
--- a/jbake-core/src/main/java/org/jbake/template/GroovyMarkupTemplateEngine.java
+++ b/jbake-core/src/main/java/org/jbake/template/GroovyMarkupTemplateEngine.java
@@ -1,17 +1,16 @@
 package org.jbake.template;
 
-import groovy.lang.GString;
 import groovy.lang.Writable;
 import groovy.text.Template;
 import groovy.text.markup.MarkupTemplateEngine;
 import groovy.text.markup.TemplateConfiguration;
-import org.apache.commons.configuration.CompositeConfiguration;
+import org.apache.commons.configuration2.CompositeConfiguration;
 import org.jbake.app.ContentStore;
 import org.jbake.app.configuration.JBakeConfiguration;
+import org.jbake.template.model.TemplateModel;
 
 import java.io.File;
 import java.io.Writer;
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -59,7 +58,7 @@ private void initializeTemplateEngine() {
     }
 
     @Override
-    public void renderDocument(final Map<String, Object> model, final String templateName, final Writer writer) throws RenderingException {
+    public void renderDocument(final TemplateModel model, final String templateName, final Writer writer) throws RenderingException {
         try {
             Template template = templateEngine.createTemplateByPath(templateName);
             Map<String, Object> wrappedModel = wrap(model);
@@ -70,20 +69,15 @@ public void renderDocument(final Map<String, Object> model, final String templat
         }
     }
 
-    private Map<String, Object> wrap(final Map<String, Object> model) {
-        return new HashMap<String, Object>(model) {
+    private TemplateModel wrap(final TemplateModel model) {
+        return new TemplateModel(model) {
             @Override
-            public Object get(final Object property) {
-                if (property instanceof String || property instanceof GString) {
-                    String key = property.toString();
-                    try {
-                        put(key, extractors.extractAndTransform(db, key, model, new TemplateEngineAdapter.NoopAdapter()));
-                    } catch (NoModelExtractorException e) {
-                        // should never happen, as we iterate over existing extractors
-                    }
+            public Object get(Object key) {
+                try {
+                    return extractors.extractAndTransform(db, (String) key, model, new TemplateEngineAdapter.NoopAdapter());
+                } catch (NoModelExtractorException e) {
+                    return super.get(key);
                 }
-
-                return super.get(property);
             }
         };
     }
diff --git a/jbake-core/src/main/java/org/jbake/template/GroovyTemplateEngine.java b/jbake-core/src/main/java/org/jbake/template/GroovyTemplateEngine.java
index 58a166038..caad683e6 100644
--- a/jbake-core/src/main/java/org/jbake/template/GroovyTemplateEngine.java
+++ b/jbake-core/src/main/java/org/jbake/template/GroovyTemplateEngine.java
@@ -1,16 +1,16 @@
 package org.jbake.template;
 
 
-import groovy.lang.GString;
 import groovy.lang.Writable;
 import groovy.text.SimpleTemplateEngine;
 import groovy.text.Template;
 import groovy.text.TemplateEngine;
 import groovy.text.XmlTemplateEngine;
-import org.apache.commons.configuration.CompositeConfiguration;
+import org.apache.commons.configuration2.CompositeConfiguration;
 import org.codehaus.groovy.runtime.MethodClosure;
 import org.jbake.app.ContentStore;
 import org.jbake.app.configuration.JBakeConfiguration;
+import org.jbake.template.model.TemplateModel;
 import org.xml.sax.SAXException;
 
 import javax.xml.parsers.ParserConfigurationException;
@@ -52,7 +52,7 @@ public GroovyTemplateEngine(final JBakeConfiguration config, final ContentStore
     }
 
     @Override
-    public void renderDocument(final Map<String, Object> model, final String templateName, final Writer writer) throws RenderingException {
+    public void renderDocument(final TemplateModel model, final String templateName, final Writer writer) throws RenderingException {
         try {
             Template template = findTemplate(templateName);
             Writable writable = template.make(wrap(model));
@@ -73,31 +73,25 @@ private Template findTemplate(final String templateName) throws SAXException, Pa
         return template;
     }
 
-    private Map<String, Object> wrap(final Map<String, Object> model) {
-        return new HashMap<String, Object>(model) {
+    private TemplateModel wrap(final TemplateModel model) {
+        return new TemplateModel(model) {
             @Override
-            public Object get(final Object property) {
-                if (property instanceof String || property instanceof GString) {
-                    String key = property.toString();
-                    if ("include".equals(key)) {
-                        return new MethodClosure(GroovyTemplateEngine.this, "doInclude").curry(this);
-                    }
-                    try {
-                        return extractors.extractAndTransform(db, key, model, new TemplateEngineAdapter.NoopAdapter());
-                    } catch (NoModelExtractorException e) {
-                        // fallback to parent model
-                    }
+            public Object get(Object key) {
+                if ("include".equals(key)) {
+                    return new MethodClosure(GroovyTemplateEngine.this, "doInclude").curry(this);
+                }
+                try {
+                    return extractors.extractAndTransform(db, (String) key, model, new TemplateEngineAdapter.NoopAdapter());
+                } catch (NoModelExtractorException e) {
+                    return super.get(key);
                 }
-
-                return super.get(property);
             }
         };
     }
 
-    private void doInclude(Map<String, Object> model, String templateName) throws Exception {
-        AbstractTemplateEngine engine = (AbstractTemplateEngine) model.get("renderer");
-        Writer out = (Writer) model.get("out");
+    private void doInclude(TemplateModel model, String templateName) throws Exception {
+        AbstractTemplateEngine engine = model.getRenderer();
+        Writer out = model.getWriter();
         engine.renderDocument(model, templateName, out);
-        model.put("out", out);
     }
 }
diff --git a/jbake-core/src/main/java/org/jbake/template/JadeTemplateEngine.java b/jbake-core/src/main/java/org/jbake/template/JadeTemplateEngine.java
index c3c48bbfa..f9187c905 100644
--- a/jbake-core/src/main/java/org/jbake/template/JadeTemplateEngine.java
+++ b/jbake-core/src/main/java/org/jbake/template/JadeTemplateEngine.java
@@ -3,7 +3,6 @@
 
 import de.neuland.jade4j.Jade4J;
 import de.neuland.jade4j.JadeConfiguration;
-import de.neuland.jade4j.exceptions.JadeCompilerException;
 import de.neuland.jade4j.filter.CDATAFilter;
 import de.neuland.jade4j.filter.CssFilter;
 import de.neuland.jade4j.filter.JsFilter;
@@ -11,10 +10,11 @@
 import de.neuland.jade4j.template.FileTemplateLoader;
 import de.neuland.jade4j.template.JadeTemplate;
 import de.neuland.jade4j.template.TemplateLoader;
-import org.apache.commons.configuration.CompositeConfiguration;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.configuration2.CompositeConfiguration;
+import org.apache.commons.text.StringEscapeUtils;
 import org.jbake.app.ContentStore;
 import org.jbake.app.configuration.JBakeConfiguration;
+import org.jbake.template.model.TemplateModel;
 
 import java.io.File;
 import java.io.IOException;
@@ -35,7 +35,7 @@ public class JadeTemplateEngine extends AbstractTemplateEngine {
     private static final String FILTER_STYLE = "css";
     private static final String FILTER_SCRIPT = "js";
 
-    private JadeConfiguration jadeConfiguration = new JadeConfiguration();
+    private final JadeConfiguration jadeConfiguration = new JadeConfiguration();
 
     @Deprecated
     public JadeTemplateEngine(final CompositeConfiguration config, final ContentStore db, final File destination, final File templatesPath) {
@@ -56,7 +56,7 @@ public JadeTemplateEngine(final JBakeConfiguration config, final ContentStore db
     }
 
     @Override
-    public void renderDocument(Map<String, Object> model, String templateName, Writer writer) throws RenderingException {
+    public void renderDocument(TemplateModel model, String templateName, Writer writer) throws RenderingException {
         try {
             JadeTemplate template = jadeConfiguration.getTemplate(templateName);
 
@@ -66,37 +66,34 @@ public void renderDocument(Map<String, Object> model, String templateName, Write
         }
     }
 
-    public void renderTemplate(JadeTemplate template, Map<String, Object> model, Writer writer) throws JadeCompilerException {
-        JadeModel jadeModel = wrap(jadeConfiguration.getSharedVariables());
-        jadeModel.putAll(model);
+    public void renderTemplate(JadeTemplate template, TemplateModel model, Writer writer) {
+        JadeModel jadeModel = wrap(model);
+        jadeModel.putAll(jadeConfiguration.getSharedVariables());
         template.process(jadeModel, writer);
     }
 
-    private JadeModel wrap(final Map<String, Object> model) {
+    private JadeModel wrap(final TemplateModel model) {
         return new JadeModel(model) {
 
             @Override
             public Object get(final Object property) {
-                String key = property.toString();
                 try {
-                    return extractors.extractAndTransform(db, key, this, new TemplateEngineAdapter.NoopAdapter());
-                } catch(NoModelExtractorException e) {
-                    // fallback to parent model
+                    return extractors.extractAndTransform(db, (String) property, this, new TemplateEngineAdapter.NoopAdapter());
+                } catch (NoModelExtractorException e) {
+                    return super.get(property);
                 }
-
-                return super.get(property);
             }
         };
     }
 
     public static class FormatHelper {
-        private Map<String, SimpleDateFormat> formatters = new HashMap<String, SimpleDateFormat>();
+        private final Map<String, SimpleDateFormat> formatters = new HashMap<>();
 
         public String format(Date date, String pattern) {
-            if(date!=null && pattern!=null) {
+            if (date != null && pattern != null) {
                 SimpleDateFormat df = formatters.get(pattern);
 
-                if(df==null) {
+                if (df == null) {
                     df = new SimpleDateFormat(pattern);
                     formatters.put(pattern, df);
                 }
@@ -108,7 +105,7 @@ public String format(Date date, String pattern) {
         }
 
         public String escape(String s) {
-            return StringEscapeUtils.escapeHtml(s);
+            return StringEscapeUtils.escapeHtml4(s);
         }
     }
 }
diff --git a/jbake-core/src/main/java/org/jbake/template/ModelExtractor.java b/jbake-core/src/main/java/org/jbake/template/ModelExtractor.java
index 16b13f07e..f15c620ec 100644
--- a/jbake-core/src/main/java/org/jbake/template/ModelExtractor.java
+++ b/jbake-core/src/main/java/org/jbake/template/ModelExtractor.java
@@ -6,10 +6,8 @@
 
 
 /**
- *
- * @author ndx
- *
  * @param <T> the type of data returned by this model extractor
+ * @author ndx
  */
 public interface ModelExtractor<T> {
 
diff --git a/jbake-core/src/main/java/org/jbake/template/PebbleTemplateEngine.java b/jbake-core/src/main/java/org/jbake/template/PebbleTemplateEngine.java
index 07819580e..427625f0e 100644
--- a/jbake-core/src/main/java/org/jbake/template/PebbleTemplateEngine.java
+++ b/jbake-core/src/main/java/org/jbake/template/PebbleTemplateEngine.java
@@ -1,18 +1,18 @@
 package org.jbake.template;
 
-import com.mitchellbosecke.pebble.PebbleEngine;
-import com.mitchellbosecke.pebble.error.PebbleException;
-import com.mitchellbosecke.pebble.extension.escaper.EscaperExtension;
-import com.mitchellbosecke.pebble.loader.FileLoader;
-import com.mitchellbosecke.pebble.loader.Loader;
-import com.mitchellbosecke.pebble.template.PebbleTemplate;
 import org.jbake.app.ContentStore;
 import org.jbake.app.configuration.JBakeConfiguration;
+import org.jbake.template.model.TemplateModel;
 
 import java.io.IOException;
 import java.io.Writer;
-import java.util.HashMap;
-import java.util.Map;
+
+import io.pebbletemplates.pebble.PebbleEngine;
+import io.pebbletemplates.pebble.error.PebbleException;
+import io.pebbletemplates.pebble.extension.escaper.EscaperExtension;
+import io.pebbletemplates.pebble.loader.FileLoader;
+import io.pebbletemplates.pebble.loader.Loader;
+import io.pebbletemplates.pebble.template.PebbleTemplate;
 
 /**
  * Renders pages using the <a href="https://pebbletemplates.io/">Pebble</a> template engine.
@@ -28,7 +28,7 @@ public PebbleTemplateEngine(final JBakeConfiguration config, final ContentStore
     }
 
     private void initializeTemplateEngine() {
-        Loader loader = new FileLoader();
+        Loader<String> loader = new FileLoader();
         loader.setPrefix(config.getTemplateFolder().getAbsolutePath());
 
         /*
@@ -42,39 +42,33 @@ private void initializeTemplateEngine() {
     }
 
     @Override
-    public void renderDocument(final Map<String, Object> model, final String templateName, final Writer writer)
+    public void renderDocument(final TemplateModel model, final String templateName, final Writer writer)
         throws RenderingException {
 
         PebbleTemplate template;
         try {
             template = engine.getTemplate(templateName);
             template.evaluate(writer, wrap(model));
-        } catch (PebbleException e) {
-            throw new RenderingException(e);
-        } catch (IOException e) {
+        } catch (PebbleException | IOException e) {
             throw new RenderingException(e);
         }
 
     }
 
-    private Map<String, Object> wrap(final Map<String, Object> model) {
-        Map<String, Object> result = new HashMap<String, Object>(model) {
+    private TemplateModel wrap(final TemplateModel model) {
+        return new TemplateModel(model) {
 
             private static final long serialVersionUID = -5489285491728950547L;
 
             @Override
             public Object get(final Object property) {
-                String key = property.toString();
                 try {
-                    return extractors.extractAndTransform(db, key, this, new TemplateEngineAdapter.NoopAdapter());
+                    return extractors.extractAndTransform(db, (String) property, this, new TemplateEngineAdapter.NoopAdapter());
                 } catch(NoModelExtractorException e) {
-                    // fallback to parent model
+                    return super.get(property);
                 }
-
-                return super.get(property);
             }
         };
 
-        return result;
     }
 }
diff --git a/jbake-core/src/main/java/org/jbake/template/TemplateEngines.java b/jbake-core/src/main/java/org/jbake/template/TemplateEngines.java
index ad3dcc2cd..a4837f8c2 100644
--- a/jbake-core/src/main/java/org/jbake/template/TemplateEngines.java
+++ b/jbake-core/src/main/java/org/jbake/template/TemplateEngines.java
@@ -79,7 +79,7 @@ private static AbstractTemplateEngine tryLoadEngine(final JBakeConfiguration con
             return ctor.newInstance(config, db);
         } catch (Throwable e) {
             // not all engines might be necessary, therefore only emit class loading issue with level warn
-            LOGGER.warn("Template engine not available: {}", engineClassName);
+            LOGGER.debug("Template engine not available: {}", engineClassName);
             return null;
         }
     }
diff --git a/jbake-core/src/main/java/org/jbake/template/ThymeleafTemplateEngine.java b/jbake-core/src/main/java/org/jbake/template/ThymeleafTemplateEngine.java
index e594e143e..a90c63e54 100644
--- a/jbake-core/src/main/java/org/jbake/template/ThymeleafTemplateEngine.java
+++ b/jbake-core/src/main/java/org/jbake/template/ThymeleafTemplateEngine.java
@@ -1,10 +1,13 @@
 package org.jbake.template;
 
-import org.apache.commons.configuration.CompositeConfiguration;
-import org.apache.commons.lang.LocaleUtils;
+import org.apache.commons.configuration2.CompositeConfiguration;
+import org.apache.commons.lang3.LocaleUtils;
 import org.jbake.app.ContentStore;
-import org.jbake.app.Crawler.Attributes;
+import org.jbake.app.configuration.DefaultJBakeConfiguration;
 import org.jbake.app.configuration.JBakeConfiguration;
+import org.jbake.model.DocumentModel;
+import org.jbake.model.ModelAttributes;
+import org.jbake.template.model.TemplateModel;
 import org.thymeleaf.TemplateEngine;
 import org.thymeleaf.context.Context;
 import org.thymeleaf.context.LazyContextVariable;
@@ -14,7 +17,6 @@
 import java.io.Writer;
 import java.util.Date;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -34,10 +36,9 @@
  * @author Cédric Champeau
  */
 public class ThymeleafTemplateEngine extends AbstractTemplateEngine {
-    private static final String DEFAULT_TEMPLATE_MODE = "HTML";
     private final ReentrantLock lock = new ReentrantLock();
     private TemplateEngine templateEngine;
-    private Context context;
+    private final Context context;
     private FileTemplateResolver templateResolver;
 
     /**
@@ -65,41 +66,30 @@ private void initializeTemplateEngine() {
         templateResolver = new FileTemplateResolver();
         templateResolver.setPrefix(config.getTemplateFolder().getAbsolutePath() + File.separatorChar);
         templateResolver.setCharacterEncoding(config.getTemplateEncoding());
-        templateResolver.setTemplateMode(DEFAULT_TEMPLATE_MODE);
+        templateResolver.setTemplateMode(DefaultJBakeConfiguration.DEFAULT_TYHMELEAF_TEMPLATE_MODE);
         templateEngine = new TemplateEngine();
         templateEngine.setTemplateResolver(templateResolver);
         templateEngine.clearTemplateCache();
     }
 
-    private void updateTemplateMode(Map<String, Object> model) {
+    private void updateTemplateMode(TemplateModel model) {
         templateResolver.setTemplateMode(getTemplateModeByModel(model));
     }
 
-    private String getTemplateModeByModel(Map<String, Object> model) {
-        @SuppressWarnings("unchecked")
-        Map<String, Object> config = (Map<String, Object>) model.get("config");
-        @SuppressWarnings("unchecked")
-        Map<String, Object> content = (Map<String, Object>) model.get("content");
-        if (config != null && content != null) {
-            String key = "template_" + content.get(Attributes.TYPE) + "_thymeleaf_mode";
-            String configMode = (String) config.get(key);
-            if (configMode != null) {
-                return configMode;
-            }
-        }
-        return DEFAULT_TEMPLATE_MODE;
+    private String getTemplateModeByModel(TemplateModel model) {
+        DocumentModel content = model.getContent();
+        return config.getThymeleafModeByType(content.getType());
     }
 
     @Override
-    public void renderDocument(Map<String, Object> model, String templateName, Writer writer) throws RenderingException {
+    public void renderDocument(TemplateModel model, String templateName, Writer writer) {
 
         String localeString = config.getThymeleafLocale();
         Locale locale = localeString != null ? LocaleUtils.toLocale(localeString) : Locale.getDefault();
 
-
         lock.lock();
         try {
-            initializeContext(locale,model);
+            initializeContext(locale, model);
             updateTemplateMode(model);
             templateEngine.process(templateName, context, writer);
         } finally {
@@ -107,13 +97,13 @@ public void renderDocument(Map<String, Object> model, String templateName, Write
         }
     }
 
-    private void initializeContext(Locale locale, Map<String, Object> model) {
+    private void initializeContext(Locale locale, TemplateModel model) {
         context.clearVariables();
         context.setLocale(locale);
         context.setVariables(model);
 
         for (String key : extractors.keySet()) {
-            context.setVariable(key, new ContextVariable(db,key,model));
+            context.setVariable(key, new ContextVariable(db, key, model));
         }
     }
 
@@ -122,11 +112,11 @@ private void initializeContext(Locale locale, Map<String, Object> model) {
      */
     private class ContextVariable extends LazyContextVariable {
 
-        private ContentStore db;
-        private String key;
-        private Map<String,Object> model;
+        private final ContentStore db;
+        private final String key;
+        private final TemplateModel model;
 
-        public ContextVariable(ContentStore db, String key, Map<String, Object> model) {
+        public ContextVariable(ContentStore db, String key, TemplateModel model) {
             this.db = db;
             this.key = key;
             this.model = model;
@@ -139,14 +129,14 @@ protected Object loadValue() {
                 return extractors.extractAndTransform(db, key, model, new TemplateEngineAdapter<LazyContextVariable>() {
                     @Override
                     public LazyContextVariable adapt(String key, final Object extractedValue) {
-                        if (key.equals(Attributes.ALLTAGS)) {
+                        if (key.equals(ModelAttributes.ALLTAGS)) {
                             return new LazyContextVariable<Set<?>>() {
                                 @Override
                                 protected Set<?> loadValue() {
                                     return (Set<?>) extractedValue;
                                 }
                             };
-                        } else if (key.equals(Attributes.PUBLISHED_DATE)) {
+                        } else if (key.equals(ModelAttributes.PUBLISHED_DATE)) {
                             return new LazyContextVariable<Date>() {
                                 @Override
                                 protected Date loadValue() {
diff --git a/jbake-core/src/main/java/org/jbake/template/model/AllContentExtractor.java b/jbake-core/src/main/java/org/jbake/template/model/AllContentExtractor.java
index db23bdd03..c6fa44946 100644
--- a/jbake-core/src/main/java/org/jbake/template/model/AllContentExtractor.java
+++ b/jbake-core/src/main/java/org/jbake/template/model/AllContentExtractor.java
@@ -2,8 +2,10 @@
 
 import org.jbake.app.ContentStore;
 import org.jbake.app.DocumentList;
+import org.jbake.model.DocumentModel;
 import org.jbake.model.DocumentTypes;
 import org.jbake.template.ModelExtractor;
+import static org.jbake.app.configuration.PropertyList.*;
 
 import java.util.Map;
 
@@ -11,13 +13,17 @@ public class AllContentExtractor implements ModelExtractor<DocumentList> {
 
     @Override
     public DocumentList get(ContentStore db, Map model, String key) {
-        DocumentList allContent = new DocumentList();
+        Map<String, Object> config = (Map<String, Object>) model.get("config");
+        String dataFileDocType = config.get(DATA_FILE_DOCTYPE.getKey().replace(".", "_")).toString();
+        DocumentList<DocumentModel> allContent = new DocumentList<>();
         String[] documentTypes = DocumentTypes.getDocumentTypes();
         for (String docType : documentTypes) {
-            DocumentList query = db.getAllContent(docType);
-            allContent.addAll(query);
+            if (!docType.equals(dataFileDocType)) {
+                DocumentList<DocumentModel> query = db.getAllContent(docType);
+                allContent.addAll(query);
+            }
         }
         return allContent;
     }
 
-}
\ No newline at end of file
+}
diff --git a/jbake-core/src/main/java/org/jbake/template/model/DataExtractor.java b/jbake-core/src/main/java/org/jbake/template/model/DataExtractor.java
new file mode 100644
index 000000000..b818825e6
--- /dev/null
+++ b/jbake-core/src/main/java/org/jbake/template/model/DataExtractor.java
@@ -0,0 +1,19 @@
+package org.jbake.template.model;
+
+import org.jbake.app.ContentStore;
+import org.jbake.template.ModelExtractor;
+import org.jbake.util.DataFileUtil;
+import java.util.Map;
+import static org.jbake.app.configuration.PropertyList.*;
+
+public class DataExtractor implements ModelExtractor<DataFileUtil> {
+
+    @Override
+    public DataFileUtil get(ContentStore db, Map model, String key) {
+        Map<String, Object> config = (Map<String, Object>) model.get("config");
+        String defaultDocType = config.get(DATA_FILE_DOCTYPE.getKey().replace(".", "_")).toString();
+        DataFileUtil dataUtil = new DataFileUtil(db, defaultDocType);
+        return dataUtil;
+    }
+
+}
diff --git a/jbake-core/src/main/java/org/jbake/template/model/PublishedContentExtractor.java b/jbake-core/src/main/java/org/jbake/template/model/PublishedContentExtractor.java
index d0aa9a603..b9b4081ec 100644
--- a/jbake-core/src/main/java/org/jbake/template/model/PublishedContentExtractor.java
+++ b/jbake-core/src/main/java/org/jbake/template/model/PublishedContentExtractor.java
@@ -2,6 +2,7 @@
 
 import org.jbake.app.ContentStore;
 import org.jbake.app.DocumentList;
+import org.jbake.model.DocumentModel;
 import org.jbake.model.DocumentTypes;
 import org.jbake.template.ModelExtractor;
 
@@ -11,10 +12,10 @@ public class PublishedContentExtractor implements ModelExtractor<DocumentList> {
 
     @Override
     public DocumentList get(ContentStore db, Map model, String key) {
-        DocumentList publishedContent = new DocumentList();
+        DocumentList<DocumentModel> publishedContent = new DocumentList<>();
         String[] documentTypes = DocumentTypes.getDocumentTypes();
         for (String docType : documentTypes) {
-            DocumentList query = db.getPublishedContent(docType);
+            DocumentList<DocumentModel> query = db.getPublishedContent(docType);
             publishedContent.addAll(query);
         }
         return publishedContent;
diff --git a/jbake-core/src/main/java/org/jbake/template/model/TagPostsExtractor.java b/jbake-core/src/main/java/org/jbake/template/model/TagPostsExtractor.java
index 4470efacb..b502fd6e5 100644
--- a/jbake-core/src/main/java/org/jbake/template/model/TagPostsExtractor.java
+++ b/jbake-core/src/main/java/org/jbake/template/model/TagPostsExtractor.java
@@ -1,7 +1,6 @@
 package org.jbake.template.model;
 
 import org.jbake.app.ContentStore;
-import org.jbake.app.Crawler;
 import org.jbake.app.DocumentList;
 import org.jbake.template.ModelExtractor;
 
@@ -12,11 +11,13 @@ public class TagPostsExtractor implements ModelExtractor<DocumentList> {
     @Override
     public DocumentList get(ContentStore db, Map model, String key) {
         String tag = null;
-        if (model.get(Crawler.Attributes.TAG) != null) {
-            tag = model.get(Crawler.Attributes.TAG).toString();
+        TemplateModel templateModel = new TemplateModel();
+        templateModel.putAll(model);
+        if (templateModel.getTag() != null) {
+            tag = templateModel.getTag();
         }
         // fetch the tag posts from db
         return db.getPublishedPostsByTag(tag);
     }
 
-}
\ No newline at end of file
+}
diff --git a/jbake-core/src/main/java/org/jbake/template/model/TaggedDocumentsExtractor.java b/jbake-core/src/main/java/org/jbake/template/model/TaggedDocumentsExtractor.java
index 3fbaff373..09402b2af 100644
--- a/jbake-core/src/main/java/org/jbake/template/model/TaggedDocumentsExtractor.java
+++ b/jbake-core/src/main/java/org/jbake/template/model/TaggedDocumentsExtractor.java
@@ -1,7 +1,6 @@
 package org.jbake.template.model;
 
 import org.jbake.app.ContentStore;
-import org.jbake.app.Crawler;
 import org.jbake.app.DocumentList;
 import org.jbake.template.ModelExtractor;
 
@@ -12,8 +11,10 @@ public class TaggedDocumentsExtractor implements ModelExtractor<DocumentList> {
     @Override
     public DocumentList get(ContentStore db, Map model, String key) {
         String tag = null;
-        if (model.get(Crawler.Attributes.TAG) != null) {
-            tag = model.get(Crawler.Attributes.TAG).toString();
+        TemplateModel templateModel = new TemplateModel();
+        templateModel.putAll(model);
+        if (templateModel.getTag() != null) {
+            tag = templateModel.getTag();
         }
         // fetch the tagged documents from db
         return db.getPublishedDocumentsByTag(tag);
diff --git a/jbake-core/src/main/java/org/jbake/template/model/TagsExtractor.java b/jbake-core/src/main/java/org/jbake/template/model/TagsExtractor.java
index 30b7c7f25..2ac2ddb3a 100644
--- a/jbake-core/src/main/java/org/jbake/template/model/TagsExtractor.java
+++ b/jbake-core/src/main/java/org/jbake/template/model/TagsExtractor.java
@@ -5,32 +5,33 @@
 import org.jbake.app.FileUtil;
 import org.jbake.template.ModelExtractor;
 
-import java.util.HashMap;
 import java.util.Map;
 
-import static org.jbake.app.configuration.JBakeProperty.OUTPUT_EXTENSION;
-import static org.jbake.app.configuration.JBakeProperty.TAG_PATH;
+import static org.jbake.app.configuration.PropertyList.OUTPUT_EXTENSION;
+import static org.jbake.app.configuration.PropertyList.TAG_PATH;
 
 
 public class TagsExtractor implements ModelExtractor<DocumentList> {
 
     @Override
     public DocumentList get(ContentStore db, Map model, String key) {
-        DocumentList dl = new DocumentList();
-        Map<?, ?> config = (Map<?, ?>) model.get("config");
+        DocumentList<TemplateModel> dl = new DocumentList<>();
+        TemplateModel templateModel = new TemplateModel();
+        templateModel.putAll(model);
+        Map<?, ?> config = templateModel.getConfig();
 
-        String tagPath = config.get(TAG_PATH.replace(".", "_")).toString();
+        String tagPath = config.get(TAG_PATH.getKey().replace(".", "_")).toString();
 
         for (String tag : db.getAllTags()) {
-            Map<String, Object> newTag = new HashMap<>();
+            TemplateModel newTag = new TemplateModel();
             String tagName = tag;
-            newTag.put("name", tagName);
+            newTag.setName(tagName);
 
-            String uri = tagPath + FileUtil.URI_SEPARATOR_CHAR + tag + config.get(OUTPUT_EXTENSION.replace(".", "_")).toString();
+            String uri = tagPath + FileUtil.URI_SEPARATOR_CHAR + tag + config.get(OUTPUT_EXTENSION.getKey().replace(".", "_")).toString();
 
-            newTag.put("uri", uri);
-            newTag.put("tagged_posts", db.getPublishedPostsByTag(tagName));
-            newTag.put("tagged_documents", db.getPublishedDocumentsByTag(tagName));
+            newTag.setUri(uri);
+            newTag.setTaggedPosts(db.getPublishedPostsByTag(tagName));
+            newTag.setTaggedDocuments(db.getPublishedDocumentsByTag(tagName));
             dl.push(newTag);
         }
         return dl;
diff --git a/jbake-core/src/main/java/org/jbake/template/model/TemplateModel.java b/jbake-core/src/main/java/org/jbake/template/model/TemplateModel.java
new file mode 100644
index 000000000..8f4cd3cfc
--- /dev/null
+++ b/jbake-core/src/main/java/org/jbake/template/model/TemplateModel.java
@@ -0,0 +1,84 @@
+package org.jbake.template.model;
+
+import org.jbake.app.DocumentList;
+import org.jbake.model.BaseModel;
+import org.jbake.model.DocumentModel;
+import org.jbake.model.ModelAttributes;
+import org.jbake.template.DelegatingTemplateEngine;
+
+import java.io.Writer;
+import java.util.Map;
+
+public class TemplateModel extends BaseModel {
+
+    public TemplateModel() {
+    }
+
+    public TemplateModel(TemplateModel model) {
+        putAll(model);
+    }
+
+    public Map<String, Object> getConfig() {
+        return (Map<String, Object>) get(ModelAttributes.CONFIG);
+    }
+
+    public void setConfig(Map<String, Object> configModel) {
+        put(ModelAttributes.CONFIG, configModel);
+    }
+
+    public DocumentModel getContent() {
+        return (DocumentModel) get(ModelAttributes.CONTENT);
+    }
+
+    public void setContent(DocumentModel content) {
+        put(ModelAttributes.CONTENT, content);
+    }
+
+    public DelegatingTemplateEngine getRenderer() {
+        return (DelegatingTemplateEngine) get(ModelAttributes.RENDERER);
+    }
+
+    public void setRenderer(DelegatingTemplateEngine renderingEngine) {
+        put(ModelAttributes.RENDERER, renderingEngine);
+    }
+
+    public void setNumberOfPages(int numberOfPages) {
+        put(ModelAttributes.NUMBER_OF_PAGES, numberOfPages);
+    }
+
+    public void setCurrentPageNuber(int currentPageNumber) {
+        put(ModelAttributes.CURRENT_PAGE_NUMBERS, currentPageNumber);
+    }
+
+    public void setPreviousFilename(String previousFilename) {
+        put(ModelAttributes.PREVIOUS_FILENAME, previousFilename);
+    }
+
+    public void setNextFileName(String nextFilename) {
+        put(ModelAttributes.NEXT_FILENAME, nextFilename);
+    }
+
+    public String getTag() {
+        return (String) get(ModelAttributes.TAG);
+    }
+
+    public void setTag(String tag) {
+        put(ModelAttributes.TAG, tag);
+    }
+
+    public void setTaggedPosts(DocumentList taggedPosts) {
+        put(ModelAttributes.TAGGED_POSTS, taggedPosts);
+    }
+
+    public void setTaggedDocuments(DocumentList taggedDocuments) {
+        put(ModelAttributes.TAGGED_DOCUMENTS, taggedDocuments);
+    }
+
+    public void setVersion(String version) {
+        put(ModelAttributes.VERSION, version);
+    }
+
+    public Writer getWriter() {
+        return (Writer) get(ModelAttributes.OUT);
+    }
+}
diff --git a/jbake-core/src/main/java/org/jbake/util/ConfigurationPrinter.java b/jbake-core/src/main/java/org/jbake/util/ConfigurationPrinter.java
new file mode 100644
index 000000000..1bbc127cb
--- /dev/null
+++ b/jbake-core/src/main/java/org/jbake/util/ConfigurationPrinter.java
@@ -0,0 +1,66 @@
+package org.jbake.util;
+
+import org.jbake.app.configuration.JBakeConfiguration;
+import org.jbake.app.configuration.Property;
+
+import java.io.PrintStream;
+import java.util.List;
+
+public class ConfigurationPrinter {
+
+    private PrintStream out;
+    private JBakeConfiguration configuration;
+
+    public ConfigurationPrinter(JBakeConfiguration configuration, PrintStream out) {
+        this.out = out;
+        this.configuration = configuration;
+    }
+
+    public void print() {
+
+        List<Property> properties = configuration.getJbakeProperties();
+        Property.Group lastGroup = null;
+
+        for (Property property : properties) {
+
+            if (lastGroup != property.getGroup()) {
+                printGroup(property);
+                this.printHeader();
+            }
+            if (!property.getDescription().isEmpty()) {
+                printDescription(property);
+            }
+            printKeyAndValue(property);
+
+            lastGroup = property.getGroup();
+        }
+    }
+
+    private void printHeader() {
+        out.printf("%1$-40s %2$-40s%n", "Key", "Value");
+        out.println(getHorizontalLine());
+    }
+
+    private String getHorizontalLine() {
+        return String.format("%080d%n", 0).replace("0", "-");
+    }
+
+    private void printGroup(Property property) {
+        out.printf("%n%s - Settings%n%n", property.getGroup());
+    }
+
+    private void printDescription(Property property) {
+        out.printf("# %s%n", property.getDescription());
+    }
+
+    private void printKeyAndValue(Property property) {
+        String key = leftFillWithDots(property.getKey());
+        Object value = configuration.get(property.getKey());
+        out.printf("%1$s: %2$-40s%n%n", key, value);
+    }
+
+    private String leftFillWithDots(String value) {
+        return String.format("%1$-40s", value).replace(' ', '.');
+    }
+
+}
diff --git a/jbake-core/src/main/java/org/jbake/util/DataFileUtil.java b/jbake-core/src/main/java/org/jbake/util/DataFileUtil.java
new file mode 100644
index 000000000..a6dcc80f8
--- /dev/null
+++ b/jbake-core/src/main/java/org/jbake/util/DataFileUtil.java
@@ -0,0 +1,37 @@
+package org.jbake.util;
+
+import org.jbake.app.ContentStore;
+import org.jbake.app.DocumentList;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class DataFileUtil {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(DataFileUtil.class);
+
+    private ContentStore db;
+    private String defaultDocType;
+
+    public DataFileUtil(ContentStore db, String defaultDocType) {
+        this.db = db;
+        this.defaultDocType = defaultDocType;
+    }
+
+    public Map<String, Object> get(String ref) {
+        Map<String, Object> result = new HashMap<>();
+        DocumentList docs = db.getDocumentByUri(ref);
+        if (docs.isEmpty()) {
+            LOGGER.warn("Unable to locate content for ref: {}", ref);
+        } else {
+            if (docs.size() == 1) {
+                result = (Map<String, Object>) docs.get(0);
+            } else {
+                LOGGER.warn("Located multiple hits for ref: {}", ref);
+            }
+        }
+        return result;
+    }
+}
diff --git a/jbake-core/src/main/java/org/jbake/util/HtmlUtil.java b/jbake-core/src/main/java/org/jbake/util/HtmlUtil.java
index cbafe6674..3794286dd 100644
--- a/jbake-core/src/main/java/org/jbake/util/HtmlUtil.java
+++ b/jbake-core/src/main/java/org/jbake/util/HtmlUtil.java
@@ -1,14 +1,12 @@
 package org.jbake.util;
 
-import org.jbake.app.Crawler.Attributes;
 import org.jbake.app.configuration.JBakeConfiguration;
+import org.jbake.model.DocumentModel;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
-import java.util.Map;
-
 /**
  * @author Manik Magar
  */
@@ -26,8 +24,8 @@ private HtmlUtil() {
      * @param fileContents  Map representing file contents
      * @param configuration Configuration object
      */
-    public static void fixImageSourceUrls(Map<String, Object> fileContents, JBakeConfiguration configuration) {
-        String htmlContent = fileContents.get(Attributes.BODY).toString();
+    public static void fixImageSourceUrls(DocumentModel fileContents, JBakeConfiguration configuration) {
+        String htmlContent = fileContents.getBody();
         boolean prependSiteHost = configuration.getImgPathPrependHost();
         String siteHost = configuration.getSiteHost();
         String uri = getDocumentUri(fileContents);
@@ -40,14 +38,14 @@ public static void fixImageSourceUrls(Map<String, Object> fileContents, JBakeCon
         }
 
         //Use body().html() to prevent adding <body></body> from parsed fragment.
-        fileContents.put(Attributes.BODY, document.body().html());
+        fileContents.setBody(document.body().html());
     }
 
-    private static String getDocumentUri(Map<String, Object> fileContents) {
-        String uri = fileContents.get(Attributes.URI).toString();
+    private static String getDocumentUri(DocumentModel fileContents) {
+        String uri = fileContents.getUri();
 
-        if (fileContents.get(Attributes.NO_EXTENSION_URI) != null) {
-            uri = fileContents.get(Attributes.NO_EXTENSION_URI).toString();
+        if (fileContents.getNoExtensionUri() != null) {
+            uri = fileContents.getNoExtensionUri();
             uri = removeTrailingSlash(uri);
         }
 
diff --git a/jbake-core/src/main/java/org/jbake/util/PagingHelper.java b/jbake-core/src/main/java/org/jbake/util/PagingHelper.java
index 4b03a301a..45763feed 100644
--- a/jbake-core/src/main/java/org/jbake/util/PagingHelper.java
+++ b/jbake-core/src/main/java/org/jbake/util/PagingHelper.java
@@ -30,7 +30,7 @@ public String getPreviousFileName(int currentPageNumber) throws URISyntaxExcepti
         if (isFirstPage(currentPageNumber)) {
             return null;
         } else {
-            if ( currentPageNumber == 2 ) {
+            if (currentPageNumber == 2) {
                 // Returning to first page, return empty string which when prefixed with content.rootpath should get to root of the site.
                 return "";
             } else {
@@ -44,7 +44,7 @@ private boolean isFirstPage(int page) {
     }
 
     public String getCurrentFileName(int page, String fileName) throws URISyntaxException {
-        if ( isFirstPage(page) ) {
+        if (isFirstPage(page)) {
             return fileName;
         } else {
             return new URI(page + URI_SEPARATOR + fileName).toString();
diff --git a/jbake-core/src/main/resources/META-INF/org.jbake.parser.MarkupEngines.properties b/jbake-core/src/main/resources/META-INF/org.jbake.parser.MarkupEngines.properties
index de6dddcf4..ac894b65d 100644
--- a/jbake-core/src/main/resources/META-INF/org.jbake.parser.MarkupEngines.properties
+++ b/jbake-core/src/main/resources/META-INF/org.jbake.parser.MarkupEngines.properties
@@ -1,3 +1,4 @@
 org.jbake.parser.RawMarkupEngine=html
 org.jbake.parser.AsciidoctorEngine=ad,adoc,asciidoc
-org.jbake.parser.MarkdownEngine=md
\ No newline at end of file
+org.jbake.parser.MarkdownEngine=md
+org.jbake.parser.YamlEngine=yml,yaml
diff --git a/jbake-core/src/main/resources/META-INF/org.jbake.template.ModelExtractors.properties b/jbake-core/src/main/resources/META-INF/org.jbake.template.ModelExtractors.properties
index 3b9d10e4d..daefe1a0e 100644
--- a/jbake-core/src/main/resources/META-INF/org.jbake.template.ModelExtractors.properties
+++ b/jbake-core/src/main/resources/META-INF/org.jbake.template.ModelExtractors.properties
@@ -9,4 +9,5 @@ org.jbake.template.model.PublishedDateExtractor=published_date
 org.jbake.template.model.DBExtractor=db
 org.jbake.template.model.TagPostsExtractor=tag_posts
 org.jbake.template.model.TaggedDocumentsExtractor=tagged_documents
+org.jbake.template.model.DataExtractor=data
 
diff --git a/jbake-core/src/main/resources/META-INF/services/org.jbake.render.RenderingTool b/jbake-core/src/main/resources/META-INF/services/org.jbake.render.RenderingTool
index ff03c55c7..59a5fa822 100644
--- a/jbake-core/src/main/resources/META-INF/services/org.jbake.render.RenderingTool
+++ b/jbake-core/src/main/resources/META-INF/services/org.jbake.render.RenderingTool
@@ -3,4 +3,5 @@ org.jbake.render.DocumentsRenderer
 org.jbake.render.FeedRenderer
 org.jbake.render.IndexRenderer
 org.jbake.render.SitemapRenderer
-org.jbake.render.TagsRenderer
\ No newline at end of file
+org.jbake.render.TagsRenderer
+org.jbake.render.Error404Renderer
\ No newline at end of file
diff --git a/jbake-core/src/main/resources/default.properties b/jbake-core/src/main/resources/default.properties
index 3f1c8233b..08c922cdc 100644
--- a/jbake-core/src/main/resources/default.properties
+++ b/jbake-core/src/main/resources/default.properties
@@ -2,6 +2,9 @@
 version=v${jbakeVersion}
 # build timestamp
 build.timestamp=${timestamp}
+# abbreviated git hash
+git.hash=${gitHash}
+
 # path to destination folder by default
 destination.folder=output
 # folder that contains all template files
@@ -10,6 +13,8 @@ template.folder=templates
 template.masterindex.file=index.ftl
 # filename of feed template file
 template.feed.file=feed.ftl
+# filename of 404 error template file
+template.error404.file=error404.ftl
 # filename of archive template file
 template.archive.file=archive.ftl
 # filename of tag template file
@@ -28,6 +33,10 @@ content.folder=content
 asset.folder=assets
 # Flag indicating if hidden asset resources should be ignored
 asset.ignore=false
+# folder that contains all data files
+data.folder=data
+# document type to use for data files
+data.file.docType=data
 
 # render index file?
 render.index=true
@@ -35,6 +44,8 @@ render.index=true
 index.file=index.html
 # render feed file?
 render.feed=true
+# render 404 page?
+render.error404=false
 # character encoding MIME name used for rendering.
 # use one of http://www.iana.org/assignments/character-sets/character-sets.xhtml
 render.encoding=UTF-8
@@ -43,6 +54,8 @@ render.encoding=UTF-8
 template.encoding=UTF-8
 # filename to use for feed
 feed.file=feed.xml
+# filename to use for 404 error
+error404.file=404.html
 # render archive file?
 render.archive=true
 # filename to use for archive file
@@ -116,6 +129,8 @@ uri.noExtension=false
 uri.noExtension.prefix=
 # default thymeleafe locale
 thymeleaf.locale=en_US
+# default output_encoding setting for freemarker
+freemarker.outputencoding=UTF-8
 # paginate index
 index.paginate=false
 # number of post per page for pagination
@@ -128,3 +143,6 @@ header.separator=~~~~~~
 img.path.update=false
 # Prepend site.host to image paths
 img.path.prepend.host=true
+
+# file used to ignore a directory
+ignore.file=.jbakeignore
diff --git a/jbake-core/src/test/java/org/jbake/FakeDocumentBuilder.java b/jbake-core/src/test/java/org/jbake/FakeDocumentBuilder.java
index 85c83be2f..c72898db4 100644
--- a/jbake-core/src/test/java/org/jbake/FakeDocumentBuilder.java
+++ b/jbake-core/src/test/java/org/jbake/FakeDocumentBuilder.java
@@ -1,80 +1,73 @@
 package org.jbake;
 
 import com.orientechnologies.orient.core.record.impl.ODocument;
-import org.jbake.app.Crawler;
-import org.jbake.model.DocumentAttributes;
+import org.jbake.model.DocumentModel;
 
 import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Random;
 
 public class FakeDocumentBuilder {
 
-    Map<String, Object> fileModel = new HashMap<String, Object>();
-    String type;
+    private DocumentModel fileModel = new DocumentModel();
+    private String type;
     private boolean hasSourceUri = false;
     private boolean hasSha1 = false;
     private boolean hasDate = false;
 
     public FakeDocumentBuilder(String type) {
         this.type = type;
-    }
-
-    public FakeDocumentBuilder withName(String name) {
-        fileModel.put(DocumentAttributes.NAME.toString(), name);
-        return this;
+        fileModel.setType(type);
     }
 
     public FakeDocumentBuilder withStatus(String status) {
-        fileModel.put(DocumentAttributes.STATUS.toString(), status);
+        fileModel.setStatus(status);
         return this;
     }
 
     public FakeDocumentBuilder withRandomSha1() throws NoSuchAlgorithmException {
-        fileModel.put(DocumentAttributes.SHA1.toString(), getRandomSha1());
+        fileModel.setSha1(getRandomSha1());
         hasSha1 = true;
         return this;
     }
 
     public FakeDocumentBuilder withDate(Date date) {
-        fileModel.put(Crawler.Attributes.DATE, date);
+        fileModel.setDate(date);
         hasDate = true;
         return this;
     }
 
     private FakeDocumentBuilder withCurrentDate() {
-        fileModel.put(Crawler.Attributes.DATE, new Date() );
+        fileModel.setDate(new Date());
         return this;
     }
 
     private FakeDocumentBuilder withRandomSourceUri() throws NoSuchAlgorithmException {
         String path = "/tmp/" + getRandomSha1() + ".txt";
-        fileModel.put(DocumentAttributes.SOURCE_URI.toString(), path);
+        fileModel.setSourceUri(path);
         return this;
     }
 
     public FakeDocumentBuilder withCached(boolean cached) {
-        fileModel.put(DocumentAttributes.CACHED.toString(), cached);
+        fileModel.setCached(cached);
         return this;
     }
 
     public void build() {
 
         try {
-            if ( ! hasSourceUri() ) {
+            if (!hasSourceUri()) {
                 this.withRandomSourceUri();
             }
-            if ( ! hasSha1() ) {
+            if (!hasSha1()) {
                 this.withRandomSha1();
             }
-            if ( ! hasDate() ) {
+            if (!hasDate()) {
                 this.withCurrentDate();
             }
-            ODocument document = new ODocument(type).fromMap(fileModel);
+            ODocument document = new ODocument("Documents").fromMap(fileModel);
             document.save();
         } catch (NoSuchAlgorithmException e) {
             e.printStackTrace();
diff --git a/jbake-core/src/test/java/org/jbake/app/AsciidocParserTest.java b/jbake-core/src/test/java/org/jbake/app/AsciidocParserTest.java
index 642964998..7382044f7 100644
--- a/jbake-core/src/test/java/org/jbake/app/AsciidocParserTest.java
+++ b/jbake-core/src/test/java/org/jbake/app/AsciidocParserTest.java
@@ -3,7 +3,8 @@
 import org.jbake.TestUtils;
 import org.jbake.app.configuration.ConfigUtil;
 import org.jbake.app.configuration.DefaultJBakeConfiguration;
-import org.jbake.app.configuration.JBakeProperty;
+import org.jbake.model.DocumentModel;
+import org.jbake.app.configuration.PropertyList;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
@@ -15,6 +16,7 @@
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.jbake.app.configuration.PropertyList.ASCIIDOCTOR_ATTRIBUTES;
 
 public class AsciidocParserTest {
 
@@ -133,77 +135,77 @@ public void createSampleFile() throws Exception {
     @Test
     public void parseAsciidocFileWithPrettifyAttribute() {
 
-        config.setProperty(JBakeProperty.ASCIIDOCTOR_ATTRIBUTES,"source-highlighter=prettify");
-        Map<String, Object> map = parser.processFile(asciidocWithSource);
+        config.setProperty(ASCIIDOCTOR_ATTRIBUTES.getKey(),"source-highlighter=prettify");
+        DocumentModel map = parser.processFile(asciidocWithSource);
         Assert.assertNotNull(map);
-        Assert.assertEquals("draft", map.get("status"));
-        Assert.assertEquals("post", map.get("type"));
-        assertThat(map.get("body").toString())
+        Assert.assertEquals("draft", map.getStatus());
+        Assert.assertEquals("post", map.getType());
+        assertThat(map.getBody())
                 .contains("class=\"paragraph\"")
                 .contains("<p>JBake now supports AsciiDoc.</p>")
                 .contains("class=\"prettyprint highlight\"");
 
-        assertThat(map.get("body").toString()).doesNotContain("I Love Jbake");
-        System.out.println(map.get("body").toString());
+        assertThat(map.getBody()).doesNotContain("I Love Jbake");
+        System.out.println(map.getBody());
     }
 
     @Test
     public void parseAsciidocFileWithCustomAttribute() {
 
-        config.setProperty(JBakeProperty.ASCIIDOCTOR_ATTRIBUTES,"source-highlighter=prettify,testattribute=I Love Jbake");
-        Map<String, Object> map = parser.processFile(asciidocWithSource);
+        config.setProperty(ASCIIDOCTOR_ATTRIBUTES.getKey(),"source-highlighter=prettify,testattribute=I Love Jbake");
+        DocumentModel map = parser.processFile(asciidocWithSource);
         Assert.assertNotNull(map);
-        Assert.assertEquals("draft", map.get("status"));
-        Assert.assertEquals("post", map.get("type"));
-        assertThat(map.get("body").toString())
+        Assert.assertEquals("draft", map.getStatus());
+        Assert.assertEquals("post", map.getType());
+        assertThat(map.getBody())
                 .contains("I Love Jbake")
                 .contains("class=\"prettyprint highlight\"");
 
-        System.out.println(map.get("body").toString());
+        System.out.println(map.getBody());
     }
 
     @Test
     public void parseValidAsciiDocFile() {
-        Map<String, Object> map = parser.processFile(validAsciidocFile);
+        DocumentModel map = parser.processFile(validAsciidocFile);
         Assert.assertNotNull(map);
-        Assert.assertEquals("draft", map.get("status"));
-        Assert.assertEquals("post", map.get("type"));
-        assertThat(map.get("body").toString())
+        Assert.assertEquals("draft", map.getStatus());
+        Assert.assertEquals("post", map.getType());
+        assertThat(map.getBody())
             .contains("class=\"paragraph\"")
             .contains("<p>JBake now supports AsciiDoc.</p>");
     }
 
     @Test
     public void parseInvalidAsciiDocFile() {
-        Map<String, Object> map = parser.processFile(invalidAsciiDocFile);
+        DocumentModel map = parser.processFile(invalidAsciiDocFile);
         Assert.assertNull(map);
     }
 
     @Test
     public void parseValidAsciiDocFileWithoutHeader() {
-        Map<String, Object> map = parser.processFile(validAsciiDocFileWithoutHeader);
+        DocumentModel map = parser.processFile(validAsciiDocFileWithoutHeader);
         Assert.assertNotNull(map);
         Assert.assertEquals("Hello: AsciiDoc!", map.get("title"));
-        Assert.assertEquals("published", map.get("status"));
-        Assert.assertEquals("page", map.get("type"));
-        assertThat(map.get("body").toString())
+        Assert.assertEquals("published", map.getStatus());
+        Assert.assertEquals("page", map.getType());
+        assertThat(map.getBody())
             .contains("class=\"paragraph\"")
             .contains("<p>JBake now supports AsciiDoc.</p>");
     }
 
     @Test
     public void parseInvalidAsciiDocFileWithoutHeader() {
-        Map<String, Object> map = parser.processFile(invalidAsciiDocFileWithoutHeader);
+        DocumentModel map = parser.processFile(invalidAsciiDocFileWithoutHeader);
         Assert.assertNull(map);
     }
 
     @Test
     public void parseValidAsciiDocFileWithExampleHeaderInContent() {
-        Map<String, Object> map = parser.processFile(validAsciiDocFileWithHeaderInContent);
+        DocumentModel map = parser.processFile(validAsciiDocFileWithHeaderInContent);
         Assert.assertNotNull(map);
-        Assert.assertEquals("published", map.get("status"));
-        Assert.assertEquals("page", map.get("type"));
-        assertThat(map.get("body").toString())
+        Assert.assertEquals("published", map.getStatus());
+        Assert.assertEquals("page", map.getType());
+        assertThat(map.getBody())
             .contains("class=\"paragraph\"")
             .contains("<p>JBake now supports AsciiDoc.</p>")
             .contains("class=\"listingblock\"")
@@ -219,11 +221,11 @@ public void parseValidAsciiDocFileWithoutJBakeMetaDataUsingDefaultTypeAndStatus(
         config.setDefaultStatus("published");
         config.setDefaultType("page");
         Parser parser = new Parser(config);
-        Map<String, Object> map = parser.processFile(validAsciiDocFileWithoutJBakeMetaData);
+        DocumentModel map = parser.processFile(validAsciiDocFileWithoutJBakeMetaData);
         Assert.assertNotNull(map);
-        Assert.assertEquals("published", map.get("status"));
-        Assert.assertEquals("page", map.get("type"));
-        assertThat(map.get("body").toString())
+        Assert.assertEquals("published", map.getStatus());
+        Assert.assertEquals("page", map.getType());
+        assertThat(map.getBody())
             .contains("<p>JBake now supports AsciiDoc documents without JBake meta data.</p>");
     }
 
diff --git a/jbake-core/src/test/java/org/jbake/app/AssetTest.java b/jbake-core/src/test/java/org/jbake/app/AssetTest.java
index 79bc85e1a..69f00746a 100644
--- a/jbake-core/src/test/java/org/jbake/app/AssetTest.java
+++ b/jbake-core/src/test/java/org/jbake/app/AssetTest.java
@@ -1,28 +1,35 @@
 package org.jbake.app;
 
-import ch.qos.logback.classic.spi.LoggingEvent;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.attribute.PosixFilePermissions;
+
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.FileFilterUtils;
 import org.jbake.TestUtils;
 import org.jbake.app.configuration.ConfigUtil;
 import org.jbake.app.configuration.DefaultJBakeConfiguration;
+import org.jbake.app.configuration.PropertyList;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.EnabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.io.TempDir;
 
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.net.URL;
-import java.nio.file.Path;
+import ch.qos.logback.classic.spi.LoggingEvent;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
 
-public class AssetTest extends LoggingTest {
+class AssetTest extends LoggingTest {
 
     public Path folder;
     private DefaultJBakeConfiguration config;
@@ -30,7 +37,7 @@ public class AssetTest extends LoggingTest {
 
 
     @BeforeEach
-    public void setup(@TempDir Path folder) throws Exception {
+    void setup(@TempDir Path folder) throws Exception {
         fixtureDir = new File(this.getClass().getResource("/fixture").getFile());
         this.folder = folder;
         config = (DefaultJBakeConfiguration) new ConfigUtil().loadConfig(fixtureDir);
@@ -40,7 +47,7 @@ public void setup(@TempDir Path folder) throws Exception {
 
 
     @Test
-    public void testCopy() throws Exception {
+    void testCopy() throws Exception {
         Asset asset = new Asset(config);
         asset.copy();
         File cssFile = new File(folder.toString() + File.separatorChar + "css" + File.separatorChar + "bootstrap.min.css");
@@ -54,7 +61,7 @@ public void testCopy() throws Exception {
     }
 
     @Test
-    public void testCopySingleFile() throws Exception {
+    void testCopySingleFile() throws Exception {
         Asset asset = new Asset(config);
         String cssSubPath = File.separatorChar + "css" + File.separatorChar + "bootstrap.min.css";
         String contentImgPath = File.separatorChar + "blog" + File.separatorChar + "2013" + File.separatorChar
@@ -76,7 +83,7 @@ public void testCopySingleFile() throws Exception {
     }
 
     @Test
-    public void shouldSkipCopyingSingleFileIfDirectory() throws IOException {
+    void shouldSkipCopyingSingleFileIfDirectory() throws IOException {
 
         Asset asset = new Asset(config);
 
@@ -90,7 +97,7 @@ public void shouldSkipCopyingSingleFileIfDirectory() throws IOException {
     }
 
     @Test
-    public void shouldLogSkipCopyingSingleFileIfDirectory() throws IOException {
+    void shouldLogSkipCopyingSingleFileIfDirectory() throws IOException {
 
         Asset asset = new Asset(config);
         File emptyDir = new File(folder.toFile(),"emptyDir");
@@ -106,7 +113,7 @@ public void shouldLogSkipCopyingSingleFileIfDirectory() throws IOException {
     }
 
     @Test
-    public void testCopyCustomFolder() throws Exception {
+    void testCopyCustomFolder() throws Exception {
         config.setAssetFolder(new File(config.getSourceFolder(), "/media"));
         Asset asset = new Asset(config);
         asset.copy();
@@ -118,7 +125,7 @@ public void testCopyCustomFolder() throws Exception {
     }
 
     @Test
-    public void testCopyIgnore() throws Exception {
+    void testCopyIgnore() throws Exception {
         File assetFolder = new File(folder.toFile(), "ignoredAssets");
         assetFolder.mkdirs();
         FileUtils.copyDirectory(new File(this.getClass().getResource("/fixture/ignorables").getFile()), assetFolder);
@@ -137,43 +144,57 @@ public void testCopyIgnore() throws Exception {
     }
 
 
-    /**
-     * Primary intention is to extend test cases to increase coverage.
-     *
-     * @throws Exception
-     */
     @Test
-    public void testWriteProtected() throws Exception {
-        File assets = new File(config.getSourceFolder(), "assets");
-        File css = new File(folder.toFile(),"css");
-        css.mkdir();
-        final File cssFile = new File(css, "bootstrap.min.css");
+    @DisabledOnOs(OS.WINDOWS)
+    void testWriteProtectedNotWindows() throws Exception {
+        File assets = config.getSourceFolder().toPath().resolve("assets").toFile();
+        Path css = folder.resolve("css");
+        Files.createDirectory(css);
+
+        File cssFile = css.resolve("bootstrap.min.css").toFile();
         FileUtils.touch(cssFile);
-        cssFile.setReadOnly();
+
+        Files.setPosixFilePermissions(css, PosixFilePermissions.fromString("r-xr-xr-x"));
 
         config.setAssetFolder(assets);
         config.setDestinationFolder(folder.toFile());
         Asset asset = new Asset(config);
+
         asset.copy();
 
-        cssFile.setWritable(true);
         Assertions.assertFalse(asset.getErrors().isEmpty(), "At least one error during copy expected");
     }
 
-    /**
-     * Primary intention is to extend test cases to increase coverage.
-     *
-     * @throws Exception
-     */
     @Test
-    public void testUnlistable() throws Exception {
+    @EnabledOnOs(OS.WINDOWS)
+    void testWriteProtectedOnWindows() throws Exception {
+        File assets = config.getSourceFolder().toPath().resolve("assets").toFile();
+        Path css = folder.resolve("css");
+        Files.createDirectory(css);
+
+        File cssFile = css.resolve("bootstrap.min.css").toFile();
+        FileUtils.touch(cssFile);
+
+        Files.setAttribute(cssFile.toPath(), "dos:readonly", true);
+
+        config.setAssetFolder(assets);
+        config.setDestinationFolder(folder.toFile());
+        Asset asset = new Asset(config);
+
+        asset.copy();
+
+        Assertions.assertFalse(asset.getErrors().isEmpty(), "At least one error during copy expected");
+    }
+
+    @Test
+    void testUnlistable() throws Exception {
         config.setAssetFolder(new File(config.getSourceFolder(), "non-exsitent"));
         Asset asset = new Asset(config);
         asset.copy();
     }
 
     @Test
-    public void testJBakeIgnoredFolder() {
+    void testJBakeIgnoredFolder() {
         URL assetsUrl = this.getClass().getResource("/fixture/assets");
         File assets = new File(assetsUrl.getFile());
         Asset asset = new Asset(config);
@@ -186,14 +207,38 @@ public void testJBakeIgnoredFolder() {
         File jsFile = new File(folder.toString() + File.separatorChar + "js" + File.separatorChar + "bootstrap.min.js");
         Assertions.assertTrue(jsFile.exists(), () -> "File " + jsFile.getAbsolutePath() + " does not exist");
         File ignorableFolder = new File(folder.toString() + File.separatorChar + "ignorablefolder");
+        File fooIgnorableFolder = new File(folder.toString() + File.separatorChar + "fooignorablefolder");
         Assertions.assertFalse(ignorableFolder.exists(), () -> "Folder " + ignorableFolder.getAbsolutePath() + " must not exist");
+        Assertions.assertTrue(fooIgnorableFolder.exists(), () -> "Folder " + fooIgnorableFolder.getAbsolutePath() + " must exist");
 
         Assertions.assertTrue(asset.getErrors().isEmpty(), "Errors during asset copying");
     }
 
+    @Test
+    void testFooIgnoredFolder() {
+        config.setProperty(PropertyList.IGNORE_FILE.getKey(), ".fooignore");
+
+        URL assetsUrl = this.getClass().getResource("/fixture/assets");
+        File assets = new File(assetsUrl.getFile());
+        Asset asset = new Asset(config);
+        asset.copy(assets);
+
+        File cssFile = new File(folder.toString() + File.separatorChar + "css" + File.separatorChar + "bootstrap.min.css");
+        Assertions.assertTrue(cssFile.exists(), () -> "File " + cssFile.getAbsolutePath() + " does not exist");
+        File imgFile = new File(folder.toString() + File.separatorChar + "img" + File.separatorChar + "glyphicons-halflings.png");
+        Assertions.assertTrue(imgFile.exists(), () -> "File " + imgFile.getAbsolutePath() + " does not exist");
+        File jsFile = new File(folder.toString() + File.separatorChar + "js" + File.separatorChar + "bootstrap.min.js");
+        Assertions.assertTrue(jsFile.exists(), () -> "File " + jsFile.getAbsolutePath() + " does not exist");
+        File ignorableFolder = new File(folder.toString() + File.separatorChar + "ignorablefolder");
+        File fooIgnorableFolder = new File(folder.toString() + File.separatorChar + "fooignorablefolder");
+        Assertions.assertTrue(ignorableFolder.exists(), () -> "Folder " + ignorableFolder.getAbsolutePath() + " must exist");
+        Assertions.assertFalse(fooIgnorableFolder.exists(), () -> "Folder " + fooIgnorableFolder.getAbsolutePath() + " must not exist");
+
+        Assertions.assertTrue(asset.getErrors().isEmpty(), "Errors during asset copying");
+    }
 
     @Test
-    public void testCopyAssetsFromContent() {
+    void testCopyAssetsFromContent() {
         URL contentUrl = this.getClass().getResource("/fixture/content");
         File contents = new File(contentUrl.getFile());
         Asset asset = new Asset(config);
@@ -217,7 +262,7 @@ public void testCopyAssetsFromContent() {
     }
 
     @Test
-    public void testIsFileAsset() {
+    void testIsFileAsset() {
         File cssAsset = new File(config.getAssetFolder().getAbsolutePath() + File.separatorChar + "css" + File.separatorChar + "bootstrap.min.css");
         Assertions.assertTrue(cssAsset.exists());
         File contentFile = new File(config.getContentFolder().getAbsolutePath() + File.separatorChar + "about.html");
@@ -234,7 +279,6 @@ private Integer countFiles(File path) {
         FileFilter filesOnly = FileFilterUtils.fileFileFilter();
         FileFilter dirsOnly = FileFilterUtils.directoryFileFilter();
         File[] files = path.listFiles(filesOnly);
-        System.out.println(files);
         total += files.length;
         for (File file : path.listFiles(dirsOnly)) {
             total += countFiles(file);
diff --git a/jbake-core/src/test/java/org/jbake/app/ContentStoreIntegrationTest.java b/jbake-core/src/test/java/org/jbake/app/ContentStoreIntegrationTest.java
index f0a97f6e5..06e27877d 100644
--- a/jbake-core/src/test/java/org/jbake/app/ContentStoreIntegrationTest.java
+++ b/jbake-core/src/test/java/org/jbake/app/ContentStoreIntegrationTest.java
@@ -13,16 +13,14 @@
 import org.junit.rules.TemporaryFolder;
 
 import java.io.File;
-import java.net.URL;
 
 public abstract class ContentStoreIntegrationTest {
 
+    @ClassRule
+    public static TemporaryFolder folder = new TemporaryFolder();
     protected static ContentStore db;
     protected static DefaultJBakeConfiguration config;
     protected static StorageType storageType = StorageType.MEMORY;
-
-    @ClassRule
-    public static TemporaryFolder folder = new TemporaryFolder();
     protected static File sourceFolder;
 
     @BeforeClass
@@ -36,7 +34,8 @@ public static void setUpClass() throws Exception {
 
         Assert.assertEquals(".html", config.getOutputExtension());
         config.setDatabaseStore(storageType.toString());
-        String dbPath = folder.newFolder("documents" + System.currentTimeMillis()).getAbsolutePath();
+        // OrientDB v3.1.x doesn't allow DB name to be a path even though docs say it's allowed
+        String dbPath = folder.newFolder("documents" + System.currentTimeMillis()).getName();
 
         // setting the database path with a colon creates an invalid url for OrientDB.
         // only one colon is expected. there is no documentation about proper url path for windows available :(
diff --git a/jbake-core/src/test/java/org/jbake/app/ContentStoreTest.java b/jbake-core/src/test/java/org/jbake/app/ContentStoreTest.java
index 77d171325..567ced0c0 100644
--- a/jbake-core/src/test/java/org/jbake/app/ContentStoreTest.java
+++ b/jbake-core/src/test/java/org/jbake/app/ContentStoreTest.java
@@ -1,19 +1,17 @@
 package org.jbake.app;
 
-import com.orientechnologies.orient.core.record.impl.ODocument;
+import org.jbake.FakeDocumentBuilder;
+import org.jbake.model.DocumentModel;
+import org.jbake.model.DocumentTypes;
+import org.jbake.model.ModelAttributes.Status;
+import org.junit.Test;
+
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Set;
-import org.jbake.FakeDocumentBuilder;
-import static org.jbake.app.ContentStore.quoteIdentifier;
-import org.jbake.app.Crawler.Attributes.Status;
-import org.jbake.model.DocumentAttributes;
-import org.jbake.model.DocumentTypes;
+
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import org.junit.Test;
 
 public class ContentStoreTest extends ContentStoreIntegrationTest {
 
@@ -24,15 +22,13 @@ public void shouldGetCountForPublishedDocuments() throws Exception {
 
         for (int i = 0; i < 5; i++) {
             FakeDocumentBuilder builder = new FakeDocumentBuilder(DOC_TYPE_POST);
-            builder.withName("dummyfile" + i)
-                    .withStatus("published")
+            builder.withStatus("published")
                     .withRandomSha1()
                     .build();
         }
 
         FakeDocumentBuilder builder = new FakeDocumentBuilder(DOC_TYPE_POST);
-        builder.withName("draftdummy")
-                .withStatus("draft")
+        builder.withStatus("draft")
                 .withRandomSha1()
                 .build();
 
@@ -40,73 +36,33 @@ public void shouldGetCountForPublishedDocuments() throws Exception {
         assertEquals(5, db.getPublishedCount(DOC_TYPE_POST));
     }
 
-    @Test
-    public void testMergeDocument() {
-        final String uri = "test/testMergeDocument";
-
-        ODocument doc = new ODocument(DOC_TYPE_POST);
-        Map<String, String> values = new HashMap();
-        values.put(Crawler.Attributes.TYPE, DOC_TYPE_POST);
-        values.put(DocumentAttributes.SOURCE_URI.toString(), uri);
-        values.put("foo", "originalValue");
-        doc.fromMap(values);
-        doc.save();
-
-        // 1st
-        values.put("foo", "newValue");
-        db.mergeDocument(values);
-
-        DocumentList docs = db.getDocumentByUri(DOC_TYPE_POST, uri);
-        assertEquals(1, docs.size());
-        assertEquals("newValue", docs.get(0).get("foo"));
-
-        // 2nd
-        values.put("foo", "anotherValue");
-        db.mergeDocument(values);
-
-        docs = db.getDocumentByUri(DOC_TYPE_POST, uri);
-        assertEquals(1, docs.size());
-        assertEquals("anotherValue", docs.get(0).get("foo"));
-
-        db.deleteContent(DOC_TYPE_POST, uri);
-        docs = db.getDocumentByUri(DOC_TYPE_POST, uri);
-        assertEquals(0, docs.size());
-    }
-
     @Test
     public void testStoreTypeWithSpecialCharacters() {
         final String typeWithHyphen = "type-with-hyphen";
 
         DocumentTypes.addDocumentType(typeWithHyphen);
 
-        final String tagWithHyphen = "tag-with-hyphen";
+        final String tagWithHyphenBackslashAndBacktick = "identifier-with\\`backtick";
         final String uri = "test/testMergeDocument";
 
-        Map<String, Object> values = new HashMap();
-        values.put(Crawler.Attributes.TYPE, typeWithHyphen);
-        values.put(Crawler.Attributes.TAG, tagWithHyphen);
-        values.put(Crawler.Attributes.TAGS, new String[]{tagWithHyphen});
-        values.put(Crawler.Attributes.STATUS, Status.DRAFT);
-        values.put(Crawler.Attributes.DATE, new Date());
-        values.put(DocumentAttributes.RENDERED.toString(), false);
-        values.put(DocumentAttributes.SOURCE_URI.toString(), uri);
-        values.put(DocumentAttributes.CACHED.toString(), true);
-        values.put(DocumentAttributes.RENDERED.toString(), false);
-        values.put("foo", "originalValue");
+        DocumentModel model = DocumentModel.createDefaultDocumentModel();
+        model.setType(typeWithHyphen);
+        model.setTags(new String[]{tagWithHyphenBackslashAndBacktick});
+        model.setDate(new Date());
+        model.setSourceUri(uri);
+        model.put("foo", "originalValue");
 
-        ODocument doc = new ODocument(typeWithHyphen);
-        doc.fromMap(values);
-        doc.save();
+        db.addDocument(model);
 
-        DocumentList documentList1 = db.getAllContent(typeWithHyphen);
+        DocumentList<DocumentModel> documentList1 = db.getAllContent(typeWithHyphen);
 
         assertEquals(1, documentList1.size());
 
-        DocumentList documentList2 = db.getAllContent(typeWithHyphen, true);
+        DocumentList<DocumentModel> documentList2 = db.getAllContent(typeWithHyphen, true);
 
         assertEquals(1, documentList2.size());
 
-        DocumentList documentList3 =  db.getDocumentByUri(typeWithHyphen, uri);
+        DocumentList<DocumentModel> documentList3 =  db.getDocumentByUri(uri);
 
         assertEquals(1, documentList3.size());
 
@@ -114,63 +70,59 @@ public void testStoreTypeWithSpecialCharacters() {
 
         assertEquals(1L, documentCount1);
 
-        DocumentList documentList4 = db.getDocumentStatus(typeWithHyphen, uri);
+        DocumentList<DocumentModel> documentList4 = db.getDocumentStatus(uri);
 
         assertEquals(1, documentList4.size());
-        assertEquals(Boolean.FALSE, documentList4.get(0).get(String.valueOf(DocumentAttributes.RENDERED)));
+        assertEquals(Boolean.FALSE, documentList4.get(0).getRendered());
 
         long documentCount2 = db.getPublishedCount(typeWithHyphen);
         assertEquals(0, documentCount2);
 
-        Map<String,Object> published = new HashMap<>();
-        published.put(DocumentAttributes.SOURCE_URI.toString(), uri);
-        published.put(Crawler.Attributes.TYPE, typeWithHyphen);
-        published.put(Crawler.Attributes.STATUS, Status.PUBLISHED);
-        db.mergeDocument(published);
+        DocumentModel published = new DocumentModel();
+        published.setSourceUri("test/another-testdocument.adoc");
+        published.setTags(new String[]{tagWithHyphenBackslashAndBacktick});
+        published.setType(typeWithHyphen);
+        published.setStatus(Status.PUBLISHED);
+        published.setCached(true);
+        published.setRendered(false);
+
+        db.addDocument(published);
 
-        DocumentList documentList5 = db.getUnrenderedContent(typeWithHyphen);
-        assertEquals(1, documentList5.size());
-        assertEquals(Boolean.FALSE, documentList5.get(0).get(String.valueOf(DocumentAttributes.RENDERED)));
-        assertEquals(typeWithHyphen, documentList5.get(0).get(Crawler.Attributes.TYPE));
-        assertEquals(tagWithHyphen, documentList5.get(0).get(Crawler.Attributes.TAG));
+        DocumentList<DocumentModel> documentList5 = db.getUnrenderedContent();
+        assertEquals(2, documentList5.size());
+        assertEquals(Boolean.FALSE, documentList5.get(0).getRendered());
+        assertEquals(typeWithHyphen, documentList5.get(0).getType());
+        assertThat(documentList5.get(0).getTags()).contains(tagWithHyphenBackslashAndBacktick);
 
         long documentCount3 = db.getPublishedCount(typeWithHyphen);
         assertEquals(1, documentCount3);
 
-        db.markContentAsRendered(typeWithHyphen);
+        db.markContentAsRendered(published);
 
-        DocumentList documentList6 = db.getPublishedContent(typeWithHyphen);
+        DocumentList<DocumentModel> documentList6 = db.getPublishedContent(typeWithHyphen);
         assertEquals(1, documentList6.size());
-        assertEquals(Boolean.TRUE, documentList6.get(0).get(String.valueOf(DocumentAttributes.RENDERED)));
-        assertEquals(typeWithHyphen, documentList6.get(0).get(Crawler.Attributes.TYPE));
-        assertEquals(tagWithHyphen, documentList6.get(0).get(Crawler.Attributes.TAG));
+        assertEquals(Boolean.TRUE, documentList6.get(0).getRendered());
+        assertEquals(typeWithHyphen, documentList6.get(0).getType());
+        assertThat(documentList6.get(0).getTags()).contains(tagWithHyphenBackslashAndBacktick);
 
-        DocumentList documentList7 = db.getPublishedDocumentsByTag(tagWithHyphen);
+        DocumentList<DocumentModel> documentList7 = db.getPublishedDocumentsByTag(tagWithHyphenBackslashAndBacktick);
         assertEquals(1, documentList7.size());
-        assertEquals(Boolean.TRUE, documentList7.get(0).get(String.valueOf(DocumentAttributes.RENDERED)));
-        assertEquals(typeWithHyphen, documentList7.get(0).get(Crawler.Attributes.TYPE));
-        assertEquals(tagWithHyphen, documentList7.get(0).get(Crawler.Attributes.TAG));
+        assertEquals(Boolean.TRUE, documentList7.get(0).getRendered());
+        assertEquals(typeWithHyphen, documentList7.get(0).getType());
+        assertThat(documentList7.get(0).getTags()).contains(tagWithHyphenBackslashAndBacktick);
 
-        DocumentList documentList8 = db.getPublishedPostsByTag(tagWithHyphen);
+        DocumentList<DocumentModel> documentList8 = db.getPublishedPostsByTag(tagWithHyphenBackslashAndBacktick);
         assertEquals(0, documentList8.size());
 
         Set<String> tags = db.getAllTags();
-        assertEquals(Collections.singleton(tagWithHyphen), tags);
+        assertEquals(Collections.singleton(tagWithHyphenBackslashAndBacktick), tags);
 
-        db.deleteContent(typeWithHyphen, uri);
+        db.deleteContent(uri);
 
         long documentCount4 = db.getDocumentCount(typeWithHyphen);
-        assertEquals(0, documentCount4);
+        assertEquals(1, documentCount4);
 
         db.deleteAllByDocType(typeWithHyphen);
     }
 
-    @Test
-    public void testIdentifierQuoting() {
-        assertNull(quoteIdentifier(null));
-        assertEquals("`normalIdentifier`", quoteIdentifier("normalIdentifier"));
-        assertEquals("`identifier-with-hyphen`", quoteIdentifier("identifier-with-hyphen"));
-        assertEquals("`identifier-with\\\\backslash`", quoteIdentifier("identifier-with\\backslash"));
-        assertEquals("`identifier-with\\`backtick`", quoteIdentifier("identifier-with`backtick"));
-    }
 }
diff --git a/jbake-core/src/test/java/org/jbake/app/CrawlerTest.java b/jbake-core/src/test/java/org/jbake/app/CrawlerTest.java
index a08315679..326f001a0 100644
--- a/jbake-core/src/test/java/org/jbake/app/CrawlerTest.java
+++ b/jbake-core/src/test/java/org/jbake/app/CrawlerTest.java
@@ -1,16 +1,24 @@
 package org.jbake.app;
 
+import com.orientechnologies.orient.core.db.record.OTrackedMap;
 import org.apache.commons.io.FilenameUtils;
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
+import org.jbake.model.DocumentModel;
+import org.jbake.model.ModelAttributes;
+import org.jbake.model.DocumentTypes;
+import org.jbake.util.DataFileUtil;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.CoreMatchers.is;
 
 public class CrawlerTest extends ContentStoreIntegrationTest {
 
@@ -22,33 +30,57 @@ public void crawl() {
         Assert.assertEquals(4, db.getDocumentCount("post"));
         Assert.assertEquals(3, db.getDocumentCount("page"));
 
-        DocumentList results = db.getPublishedPosts();
+        DocumentList<DocumentModel> results = db.getPublishedPosts();
 
         assertThat(results.size()).isEqualTo(3);
 
         for (Map<String, Object> content : results) {
             assertThat(content)
-                    .containsKey(Crawler.Attributes.ROOTPATH)
+                    .containsKey(ModelAttributes.ROOTPATH)
                     .containsValue("../../../");
         }
 
-        DocumentList allPosts = db.getAllContent("post");
+        DocumentList<DocumentModel> allPosts = db.getAllContent("post");
 
         assertThat(allPosts.size()).isEqualTo(4);
 
-        for (Map<String, Object> content : allPosts) {
-            if (content.get(Crawler.Attributes.TITLE).equals("Draft Post")) {
-                assertThat(content).containsKey(Crawler.Attributes.DATE);
+        for (DocumentModel content : allPosts) {
+            if (content.getTitle().equals("Draft Post")) {
+                assertThat(content).containsKey(ModelAttributes.DATE);
             }
         }
 
         // covers bug #213
-        DocumentList publishedPostsByTag = db.getPublishedPostsByTag("blog");
+        DocumentList<DocumentModel> publishedPostsByTag = db.getPublishedPostsByTag("blog");
         Assert.assertEquals(3, publishedPostsByTag.size());
     }
 
     @Test
-    public void renderWithPrettyUrls() throws Exception {
+    public void crawlDataFiles() {
+        Crawler crawler = new Crawler(db, config);
+        // manually register data doctype
+        DocumentTypes.addDocumentType(config.getDataFileDocType());
+        db.updateSchema();
+        crawler.crawlDataFiles();
+        Assert.assertEquals(2, db.getDocumentCount("data"));
+
+        DataFileUtil dataFileUtil = new DataFileUtil(db, "data");
+        Map<String, Object> videos = dataFileUtil.get("videos.yaml");
+        Assert.assertFalse(videos.isEmpty());
+        Assert.assertNotNull(videos.get("data"));
+
+        // regression test for issue 747
+        Map<String, Object> authorsFileContents = dataFileUtil.get("authors.yaml");
+        Assert.assertFalse(authorsFileContents.isEmpty());
+        Object authorsList = authorsFileContents.get("authors");
+        assertThat(authorsList).isNotInstanceOf(OTrackedMap.class);
+        assertThat(authorsList).isInstanceOf(HashMap.class);
+        HashMap<String, Map<String, Object>> authors = (HashMap<String, Map<String, Object>>) authorsList;
+        assertThat(authors.get("Joe Bloggs").get("last_name")).isEqualTo("Bloggs");
+    }
+
+    @Test
+    public void renderWithPrettyUrls() {
 
         config.setUriWithoutExtension(true);
         config.setPrefixForUriWithoutExtension("/blog");
@@ -59,15 +91,14 @@ public void renderWithPrettyUrls() throws Exception {
         Assert.assertEquals(4, db.getDocumentCount("post"));
         Assert.assertEquals(3, db.getDocumentCount("page"));
 
-        DocumentList documents = db.getPublishedPosts();
-
-        for (Map<String, Object> model : documents) {
-            String noExtensionUri = "blog/\\d{4}/" + FilenameUtils.getBaseName((String) model.get("file")) + "/";
+        DocumentList<DocumentModel> documents = db.getPublishedPosts();
 
-            Assert.assertThat(model.get("noExtensionUri"), RegexMatcher.matches(noExtensionUri));
-            Assert.assertThat(model.get("uri"), RegexMatcher.matches(noExtensionUri + "index\\.html"));
+        for (DocumentModel model : documents) {
+            String noExtensionUri = "blog/\\d{4}/" + FilenameUtils.getBaseName(model.getFile()) + "/";
 
-            assertThat(model).containsEntry("rootpath", "../../../");
+            Assert.assertThat(model.getNoExtensionUri(), RegexMatcher.matches(noExtensionUri));
+            Assert.assertThat(model.getUri(), RegexMatcher.matches(noExtensionUri + "index\\.html"));
+            Assert.assertThat(model.getRootPath(), is("../../../"));
         }
     }
 
diff --git a/jbake-core/src/test/java/org/jbake/app/DebugUtilTest.java b/jbake-core/src/test/java/org/jbake/app/DebugUtilTest.java
index c03350b5e..e6cfde31d 100644
--- a/jbake-core/src/test/java/org/jbake/app/DebugUtilTest.java
+++ b/jbake-core/src/test/java/org/jbake/app/DebugUtilTest.java
@@ -1,15 +1,15 @@
 package org.jbake.app;
 
+import org.jbake.util.DebugUtil;
+import org.junit.Assert;
+import org.junit.Test;
+
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 
-import org.jbake.util.DebugUtil;
-import org.junit.Assert;
-import org.junit.Test;
-
 public class DebugUtilTest {
 
     @Test
diff --git a/jbake-core/src/test/java/org/jbake/app/FileUtilTest.java b/jbake-core/src/test/java/org/jbake/app/FileUtilTest.java
index 34d283ef0..359d75dc9 100644
--- a/jbake-core/src/test/java/org/jbake/app/FileUtilTest.java
+++ b/jbake-core/src/test/java/org/jbake/app/FileUtilTest.java
@@ -37,7 +37,7 @@ public void testIsFileInDirectory() throws Exception {
         assertFalse("jbake.properties file should not be in the /fixture/content directory", FileUtil.isFileInDirectory(jbakeFile, contentDir));
     }
 
-    @Test  
+    @Test
     public void testGetContentRoothPath() throws Exception {
 
         File source = TestUtils.getTestResourcesAsSourceFolder();
diff --git a/jbake-core/src/test/java/org/jbake/app/MdParserTest.java b/jbake-core/src/test/java/org/jbake/app/MdParserTest.java
index f18a6c1bc..1b1dceb53 100644
--- a/jbake-core/src/test/java/org/jbake/app/MdParserTest.java
+++ b/jbake-core/src/test/java/org/jbake/app/MdParserTest.java
@@ -1,9 +1,9 @@
-
 package org.jbake.app;
 
 import org.jbake.TestUtils;
 import org.jbake.app.configuration.ConfigUtil;
 import org.jbake.app.configuration.DefaultJBakeConfiguration;
+import org.jbake.model.DocumentModel;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
@@ -12,14 +12,13 @@
 
 import java.io.File;
 import java.io.PrintWriter;
-import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Tests basic Markdown syntax and the extensions supported by the Markdown
  * processor (Pegdown).
- * 
+ *
  * @author Jonathan Bullock <jonbullock@gmail.com>
  * @author Kevin S. Clarke <ksclarke@gmail.com>
  */
@@ -232,440 +231,440 @@ public void createSampleFile() throws Exception {
     }
 
     @Test
-    public void parseValidMarkdownFileBasic() throws Exception {
+    public void parseValidMarkdownFileBasic() {
         Parser parser = new Parser(config);
-        Map<String, Object> map = parser.processFile(validMdFileBasic);
-        Assert.assertNotNull(map);
-        Assert.assertEquals("draft", map.get("status"));
-        Assert.assertEquals("post", map.get("type"));
-        Assert.assertEquals("<h1>This is a test</h1>\n", map.get("body"));
+        DocumentModel documentModel = parser.processFile(validMdFileBasic);
+        Assert.assertNotNull(documentModel);
+        Assert.assertEquals("draft", documentModel.getStatus());
+        Assert.assertEquals("post", documentModel.getType());
+        Assert.assertEquals("<h1>This is a test</h1>\n", documentModel.getBody());
     }
 
     @Test
     public void parseInvalidMarkdownFileBasic() {
         Parser parser = new Parser(config);
-        Map<String, Object> map = parser.processFile(invalidMdFileBasic);
-        Assert.assertNull(map);
+        DocumentModel documentModel = parser.processFile(invalidMdFileBasic);
+        Assert.assertNull(documentModel);
     }
 
     @Test
-    public void parseValidMdFileHardWraps() throws Exception {
+    public void parseValidMdFileHardWraps() {
         config.setMarkdownExtensions("HARDWRAPS");
 
         // Test with HARDWRAPS
         Parser parser = new Parser(config);
-        Map<String, Object> map = parser.processFile(mdFileHardWraps);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains("<p>First line<br />\nSecond line</p>\n");
+        DocumentModel documentModel = parser.processFile(mdFileHardWraps);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains("<p>First line<br />\nSecond line</p>\n");
 
         // Test without HARDWRAPS
         config.setMarkdownExtensions("");
         parser = new Parser(config);
-        map = parser.processFile(mdFileHardWraps);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains("<p>First line Second line</p>");
+        documentModel = parser.processFile(mdFileHardWraps);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains("<p>First line Second line</p>");
     }
 
     @Test
-    public void parseWithInvalidExtension() throws Exception {
+    public void parseWithInvalidExtension() {
         config.setMarkdownExtensions("HARDWRAPS,UNDEFINED_EXTENSION");
 
         // Test with HARDWRAPS
         Parser parser = new Parser(config);
-        Map<String, Object> map = parser.processFile(mdFileHardWraps);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains("<p>First line<br />\nSecond line</p>\n");
+        DocumentModel documentModel = parser.processFile(mdFileHardWraps);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains("<p>First line<br />\nSecond line</p>\n");
     }
 
     @Test
-    public void parseValidMdFileAbbreviations() throws Exception {
+    public void parseValidMdFileAbbreviations() {
         config.setMarkdownExtensions("ABBREVIATIONS");
 
         // Test with ABBREVIATIONS
         Parser parser = new Parser(config);
-        Map<String, Object> map = parser.processFile(mdFileAbbreviations);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains(
-                "<p><abbr title=\"Hyper Text Markup Language\">HTML</abbr></p>"
+        DocumentModel documentModel = parser.processFile(mdFileAbbreviations);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains(
+            "<p><abbr title=\"Hyper Text Markup Language\">HTML</abbr></p>"
         );
 
         // Test without ABBREVIATIONS
         config.setMarkdownExtensions("");
         parser = new Parser(config);
-        map = parser.processFile(mdFileAbbreviations);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains("<p>*[HTML]: Hyper Text Markup Language HTML</p>");
+        documentModel = parser.processFile(mdFileAbbreviations);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains("<p>*[HTML]: Hyper Text Markup Language HTML</p>");
     }
 
     @Test
-    public void parseValidMdFileAutolinks() throws Exception {
+    public void parseValidMdFileAutolinks() {
         config.setMarkdownExtensions("");
         config.setMarkdownExtensions("AUTOLINKS");
 
         // Test with AUTOLINKS
         Parser parser = new Parser(config);
-        Map<String, Object> map = parser.processFile(mdFileAutolinks);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains(
-                "<p><a href=\"http://github.com\">http://github.com</a></p>"
+        DocumentModel documentModel = parser.processFile(mdFileAutolinks);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains(
+            "<p><a href=\"http://github.com\">http://github.com</a></p>"
         );
 
         // Test without AUTOLINKS
         config.setMarkdownExtensions("");
         parser = new Parser(config);
-        map = parser.processFile(mdFileAutolinks);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains("<p>http://github.com</p>");
+        documentModel = parser.processFile(mdFileAutolinks);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains("<p>http://github.com</p>");
     }
 
     @Test
-    public void parseValidMdFileDefinitions() throws Exception {
+    public void parseValidMdFileDefinitions() {
         config.setMarkdownExtensions("");
         config.setMarkdownExtensions("DEFINITIONS");
 
         // Test with DEFINITIONS
         Parser parser = new Parser(config);
-        Map<String, Object> map = parser.processFile(mdFileDefinitions);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains(
-                "<dl>\n<dt>Apple</dt>\n<dd>Pomaceous fruit</dd>\n</dl>"
+        DocumentModel documentModel = parser.processFile(mdFileDefinitions);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains(
+            "<dl>\n<dt>Apple</dt>\n<dd>Pomaceous fruit</dd>\n</dl>"
         );
 
         // Test without DEFNITIONS
         config.setMarkdownExtensions("");
         parser = new Parser(config);
-        map = parser.processFile(mdFileDefinitions);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains("<p>Apple :   Pomaceous fruit</p>");
+        documentModel = parser.processFile(mdFileDefinitions);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains("<p>Apple :   Pomaceous fruit</p>");
     }
 
     @Test
-    public void parseValidMdFileFencedCodeBlocks() throws Exception {
+    public void parseValidMdFileFencedCodeBlocks() {
         config.setMarkdownExtensions("");
         config.setMarkdownExtensions("FENCED_CODE_BLOCKS");
 
         // Test with FENCED_CODE_BLOCKS
         Parser parser = new Parser(config);
-        Map<String, Object> map = parser.processFile(mdFileFencedCodeBlocks);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains(
-                "<pre><code>function test() {\n  console.log(&quot;!&quot;);\n}\n</code></pre>"
+        DocumentModel documentModel = parser.processFile(mdFileFencedCodeBlocks);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains(
+            "<pre><code>function test() {\n  console.log(&quot;!&quot;);\n}\n</code></pre>"
         );
 
         // Test without FENCED_CODE_BLOCKS
         config.setMarkdownExtensions("");
         parser = new Parser(config);
-        map = parser.processFile(mdFileFencedCodeBlocks);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains(
-                "<p><code>function test() { console.log(&quot;!&quot;); }</code></p>"
+        documentModel = parser.processFile(mdFileFencedCodeBlocks);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains(
+            "<p><code>function test() { console.log(&quot;!&quot;); }</code></p>"
         );
     }
 
     @Test
-    public void parseValidMdFileQuotes() throws Exception {
+    public void parseValidMdFileQuotes() {
         config.setMarkdownExtensions("");
         config.setMarkdownExtensions("QUOTES");
 
         // Test with QUOTES
         Parser parser = new Parser(config);
-        Map<String, Object> map = parser.processFile(mdFileQuotes);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains("<p>&ldquo;quotes&rdquo;</p>");
+        DocumentModel documentModel = parser.processFile(mdFileQuotes);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains("<p>&ldquo;quotes&rdquo;</p>");
 
         // Test without QUOTES
         config.setMarkdownExtensions("");
         parser = new Parser(config);
-        map = parser.processFile(mdFileQuotes);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains("<p>&quot;quotes&quot;</p>");
+        documentModel = parser.processFile(mdFileQuotes);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains("<p>&quot;quotes&quot;</p>");
     }
 
     @Test
-    public void parseValidMdFileSmarts() throws Exception {
+    public void parseValidMdFileSmarts() {
         config.setMarkdownExtensions("");
         config.setMarkdownExtensions("SMARTS");
 
         // Test with SMARTS
         Parser parser = new Parser(config);
-        Map<String, Object> map = parser.processFile(mdFileSmarts);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains("<p>&hellip;</p>");
+        DocumentModel documentModel = parser.processFile(mdFileSmarts);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains("<p>&hellip;</p>");
 
         // Test without SMARTS
         config.setMarkdownExtensions("");
         parser = new Parser(config);
-        map = parser.processFile(mdFileSmarts);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains("<p>...</p>");
+        documentModel = parser.processFile(mdFileSmarts);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains("<p>...</p>");
     }
 
     @Test
-    public void parseValidMdFileSmartypants() throws Exception {
+    public void parseValidMdFileSmartypants() {
         config.setMarkdownExtensions("");
         config.setMarkdownExtensions("SMARTYPANTS");
 
         // Test with SMARTYPANTS
         Parser parser = new Parser(config);
-        Map<String, Object> map = parser.processFile(mdFileSmartypants);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains("<p>&ldquo;&hellip;&rdquo;</p>");
+        DocumentModel documentModel = parser.processFile(mdFileSmartypants);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains("<p>&ldquo;&hellip;&rdquo;</p>");
 
         // Test without SMARTYPANTS
         config.setMarkdownExtensions("");
         parser = new Parser(config);
-        map = parser.processFile(mdFileSmartypants);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains("<p>&quot;...&quot;</p>");
+        documentModel = parser.processFile(mdFileSmartypants);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains("<p>&quot;...&quot;</p>");
     }
 
     @Test
-    public void parseValidMdFileSuppressAllHTML() throws Exception {
+    public void parseValidMdFileSuppressAllHTML() {
         config.setMarkdownExtensions("");
         config.setMarkdownExtensions("SUPPRESS_ALL_HTML");
 
         // Test with SUPPRESS_ALL_HTML
         Parser parser = new Parser(config);
-        Map<String, Object> map = parser.processFile(mdFileSuppressAllHTML);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains("");
+        DocumentModel documentModel = parser.processFile(mdFileSuppressAllHTML);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains("");
 
         // Test without SUPPRESS_ALL_HTML
         config.setMarkdownExtensions("");
         parser = new Parser(config);
-        map = parser.processFile(mdFileSuppressAllHTML);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains("<div>!</div><em>!</em>");
+        documentModel = parser.processFile(mdFileSuppressAllHTML);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains("<div>!</div><em>!</em>");
     }
 
     @Test
-    public void parseValidMdFileSuppressHTMLBlocks() throws Exception {
+    public void parseValidMdFileSuppressHTMLBlocks() {
         config.setMarkdownExtensions("");
         config.setMarkdownExtensions("SUPPRESS_HTML_BLOCKS");
 
         // Test with SUPPRESS_HTML_BLOCKS
         Parser parser = new Parser(config);
-        Map<String, Object> map = parser.processFile(mdFileSuppressHTMLBlocks);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains("");
+        DocumentModel documentModel = parser.processFile(mdFileSuppressHTMLBlocks);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains("");
 
         // Test without SUPPRESS_HTML_BLOCKS
         config.setMarkdownExtensions("");
         parser = new Parser(config);
-        map = parser.processFile(mdFileSuppressHTMLBlocks);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains("<div>!</div><em>!</em>");
+        documentModel = parser.processFile(mdFileSuppressHTMLBlocks);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains("<div>!</div><em>!</em>");
     }
 
     @Test
-    public void parseValidMdFileSuppressInlineHTML() throws Exception {
+    public void parseValidMdFileSuppressInlineHTML() {
         config.setMarkdownExtensions("");
         config.setMarkdownExtensions("SUPPRESS_INLINE_HTML");
 
         // Test with SUPPRESS_INLINE_HTML
         Parser parser = new Parser(config);
-        Map<String, Object> map = parser.processFile(mdFileSuppressInlineHTML);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains("<p>This is the first paragraph.  with  inline html</p>");
+        DocumentModel documentModel = parser.processFile(mdFileSuppressInlineHTML);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains("<p>This is the first paragraph.  with  inline html</p>");
 
         // Test without SUPPRESS_INLINE_HTML
         config.setMarkdownExtensions("");
         parser = new Parser(config);
-        map = parser.processFile(mdFileSuppressInlineHTML);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains("<p>This is the first paragraph. <span> with </span> inline html</p>");
+        documentModel = parser.processFile(mdFileSuppressInlineHTML);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains("<p>This is the first paragraph. <span> with </span> inline html</p>");
     }
 
     @Test
-    public void parseValidMdFileTables() throws Exception {
+    public void parseValidMdFileTables() {
         config.setMarkdownExtensions("");
         config.setMarkdownExtensions("TABLES");
 
         // Test with TABLES
         Parser parser = new Parser(config);
-        Map<String, Object> map = parser.processFile(mdFileTables);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains(
+        DocumentModel documentModel = parser.processFile(mdFileTables);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains(
                 "<table>\n" +
-                "<thead>\n" +
-                "<tr><th>First Header</th><th>Second Header</th></tr>\n" +
-                "</thead>\n" +
-                "<tbody>\n" +
-                "<tr><td>Content Cell</td><td>Content Cell</td></tr>\n" +
-                "<tr><td>Content Cell</td><td>Content Cell</td></tr>\n" +
-                "</tbody>\n" +
-                "</table>"
+                    "<thead>\n" +
+                    "<tr><th>First Header</th><th>Second Header</th></tr>\n" +
+                    "</thead>\n" +
+                    "<tbody>\n" +
+                    "<tr><td>Content Cell</td><td>Content Cell</td></tr>\n" +
+                    "<tr><td>Content Cell</td><td>Content Cell</td></tr>\n" +
+                    "</tbody>\n" +
+                    "</table>"
         );
 
         // Test without TABLES
         config.setMarkdownExtensions("");
         parser = new Parser(config);
-        map = parser.processFile(mdFileTables);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains(
-                "<p>First Header|Second Header -------------|------------- Content Cell|Content Cell Content Cell|Content Cell</p>"
+        documentModel = parser.processFile(mdFileTables);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains(
+            "<p>First Header|Second Header -------------|------------- Content Cell|Content Cell Content Cell|Content Cell</p>"
         );
     }
 
     @Test
-    public void parseValidMdFileWikilinks() throws Exception {
+    public void parseValidMdFileWikilinks() {
         config.setMarkdownExtensions("");
         config.setMarkdownExtensions("WIKILINKS");
 
         // Test with WIKILINKS
         Parser parser = new Parser(config);
-        Map<String, Object> map = parser.processFile(mdFileWikilinks);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains(
-                "<p><a href=\"Wiki-style-links\">Wiki-style links</a></p>"
+        DocumentModel documentModel = parser.processFile(mdFileWikilinks);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains(
+            "<p><a href=\"Wiki-style-links\">Wiki-style links</a></p>"
         );
 
         // Test without WIKILINKS
         config.setMarkdownExtensions("");
         parser = new Parser(config);
-        map = parser.processFile(mdFileWikilinks);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains("<p>[[Wiki-style links]]</p>");
+        documentModel = parser.processFile(mdFileWikilinks);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains("<p>[[Wiki-style links]]</p>");
     }
 
     @Test
-    public void parseValidMdFileAtxheaderspace() throws Exception {
+    public void parseValidMdFileAtxheaderspace() {
         config.setMarkdownExtensions("");
         config.setMarkdownExtensions("ATXHEADERSPACE");
 
         // Test with ATXHEADERSPACE
         Parser parser = new Parser(config);
-        Map<String, Object> map = parser.processFile(mdFileAtxheaderspace);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains("<p>#Test</p>");
+        DocumentModel documentModel = parser.processFile(mdFileAtxheaderspace);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains("<p>#Test</p>");
 
         // Test without ATXHEADERSPACE
         config.setMarkdownExtensions("");
         parser = new Parser(config);
-        map = parser.processFile(mdFileAtxheaderspace);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains("<h1>Test</h1>");
+        documentModel = parser.processFile(mdFileAtxheaderspace);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains("<h1>Test</h1>");
     }
 
     @Test
-    public void parseValidMdFileForcelistitempara() throws Exception {
+    public void parseValidMdFileForcelistitempara() {
         config.setMarkdownExtensions("");
         config.setMarkdownExtensions("FORCELISTITEMPARA");
 
         // Test with FORCELISTITEMPARA
         Parser parser = new Parser(config);
-        Map<String, Object> map = parser.processFile(mdFileForcelistitempara);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains(
+        DocumentModel documentModel = parser.processFile(mdFileForcelistitempara);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains(
                 "<ol>\n" +
-                "<li>\n" +
-                "<p>Item 1 Item 1 lazy continuation</p>\n" +
-                "<p>Item 1 paragraph 1 Item 1 paragraph 1 lazy continuation Item 1 paragraph 1 continuation</p>\n" +
-                "</li>\n" +
-                "</ol>");
+                    "<li>\n" +
+                    "<p>Item 1 Item 1 lazy continuation</p>\n" +
+                    "<p>Item 1 paragraph 1 Item 1 paragraph 1 lazy continuation Item 1 paragraph 1 continuation</p>\n" +
+                    "</li>\n" +
+                    "</ol>");
 
         // Test without FORCELISTITEMPARA
         config.setMarkdownExtensions("");
         parser = new Parser(config);
-        map = parser.processFile(mdFileForcelistitempara);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains(
+        documentModel = parser.processFile(mdFileForcelistitempara);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains(
                 "<ol>\n" +
-                "<li>Item 1 Item 1 lazy continuation\n" +
-                "<p>Item 1 paragraph 1 Item 1 paragraph 1 lazy continuation Item 1 paragraph 1 continuation</p>\n" +
-                "</li>\n" +
-                "</ol>"
+                    "<li>Item 1 Item 1 lazy continuation\n" +
+                    "<p>Item 1 paragraph 1 Item 1 paragraph 1 lazy continuation Item 1 paragraph 1 continuation</p>\n" +
+                    "</li>\n" +
+                    "</ol>"
         );
     }
 
     @Test
-    public void parseValidMdFileRelaxedhrules() throws Exception {
+    public void parseValidMdFileRelaxedhrules() {
         config.setMarkdownExtensions("");
         config.setMarkdownExtensions("RELAXEDHRULES");
 
         // Test with RELAXEDHRULES
         Parser parser = new Parser(config);
-        Map<String, Object> map = parser.processFile(mdFileRelaxedhrules);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains(
+        DocumentModel documentModel = parser.processFile(mdFileRelaxedhrules);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains(
                 "<h2>Hello World</h2>\n" +
-                "<hr />\n" +
-                "<hr />\n" +
-                "<p>Hello World</p>\n" +
-                "<hr />\n" +
-                "<hr />\n" +
-                "<hr />\n" +
-                "<p>Hello World</p>\n" +
-                "<hr />\n" +
-                "<hr />\n" +
-                "<hr />"
+                    "<hr />\n" +
+                    "<hr />\n" +
+                    "<p>Hello World</p>\n" +
+                    "<hr />\n" +
+                    "<hr />\n" +
+                    "<hr />\n" +
+                    "<p>Hello World</p>\n" +
+                    "<hr />\n" +
+                    "<hr />\n" +
+                    "<hr />"
         );
 
         // Test without RELAXEDHRULES
         config.setMarkdownExtensions("");
         parser = new Parser(config);
-        map = parser.processFile(mdFileRelaxedhrules);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains(
+        documentModel = parser.processFile(mdFileRelaxedhrules);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains(
                 "<h2>Hello World</h2>\n" +
-                "<hr />\n" +
-                "<hr />\n" +
-                "<h2>Hello World ***</h2>\n" +
-                "<hr />\n" +
-                "<h2>Hello World ___</h2>\n" +
-                "<hr />"
+                    "<hr />\n" +
+                    "<hr />\n" +
+                    "<h2>Hello World ***</h2>\n" +
+                    "<hr />\n" +
+                    "<h2>Hello World ___</h2>\n" +
+                    "<hr />"
         );
     }
 
     @Test
-    public void parseValidMdFileTasklistitems() throws Exception {
+    public void parseValidMdFileTasklistitems() {
         config.setMarkdownExtensions("");
         config.setMarkdownExtensions("TASKLISTITEMS");
 
         // Test with TASKLISTITEMS
         Parser parser = new Parser(config);
-        Map<String, Object> map = parser.processFile(mdTasklistitems);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains(
+        DocumentModel documentModel = parser.processFile(mdTasklistitems);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains(
                 "<ul>\n" +
-                "<li>loose bullet item 3</li>\n" +
-                "<li class=\"task-list-item\"><input type=\"checkbox\" class=\"task-list-item-checkbox\" disabled=\"disabled\" readonly=\"readonly\" />&nbsp;open task item</li>\n" +
-                "<li class=\"task-list-item\"><input type=\"checkbox\" class=\"task-list-item-checkbox\" checked=\"checked\" disabled=\"disabled\" readonly=\"readonly\" />&nbsp;closed task item</li>\n" +
-                "</ul>"
+                    "<li>loose bullet item 3</li>\n" +
+                    "<li class=\"task-list-item\"><input type=\"checkbox\" class=\"task-list-item-checkbox\" disabled=\"disabled\" readonly=\"readonly\" />&nbsp;open task item</li>\n" +
+                    "<li class=\"task-list-item\"><input type=\"checkbox\" class=\"task-list-item-checkbox\" checked=\"checked\" disabled=\"disabled\" readonly=\"readonly\" />&nbsp;closed task item</li>\n" +
+                    "</ul>"
         );
 
         // Test without TASKLISTITEMS
         config.setMarkdownExtensions("");
         parser = new Parser(config);
-        map = parser.processFile(mdTasklistitems);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains(
+        documentModel = parser.processFile(mdTasklistitems);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains(
                 "<ul>\n" +
-                "<li>loose bullet item 3</li>\n" +
-                "<li>[ ] open task item</li>\n" +
-                "<li>[x] closed task item</li>\n" +
-                "</ul>");
+                    "<li>loose bullet item 3</li>\n" +
+                    "<li>[ ] open task item</li>\n" +
+                    "<li>[x] closed task item</li>\n" +
+                    "</ul>");
     }
 
     @Test
-    public void parseValidMdFileExtanchorlinks() throws Exception {
+    public void parseValidMdFileExtanchorlinks() {
         config.setMarkdownExtensions("");
         config.setMarkdownExtensions("EXTANCHORLINKS");
 
         // Test with EXTANCHORLINKS
         Parser parser = new Parser(config);
-        Map<String, Object> map = parser.processFile(mdExtanchorlinks);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains(
-                "<h1><a href=\"#header-some-formatting-chars\" id=\"header-some-formatting-chars\"></a>header &amp; some <em>formatting</em> ~~chars~~</h1>"
+        DocumentModel documentModel = parser.processFile(mdExtanchorlinks);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains(
+            "<h1><a href=\"#header-some-formatting-chars\" id=\"header-some-formatting-chars\"></a>header &amp; some <em>formatting</em> ~~chars~~</h1>"
         );
 
         // Test without EXTANCHORLINKS
         config.setMarkdownExtensions("");
         parser = new Parser(config);
-        map = parser.processFile(mdExtanchorlinks);
-        Assert.assertNotNull(map);
-        assertThat(map.get("body").toString()).contains("<h1>header &amp; some <em>formatting</em> ~~chars~~</h1>");
+        documentModel = parser.processFile(mdExtanchorlinks);
+        Assert.assertNotNull(documentModel);
+        assertThat(documentModel.getBody()).contains("<h1>header &amp; some <em>formatting</em> ~~chars~~</h1>");
     }
 
 
diff --git a/jbake-core/src/test/java/org/jbake/app/OvenTest.java b/jbake-core/src/test/java/org/jbake/app/OvenTest.java
index a945d2cb6..a59e84aec 100644
--- a/jbake-core/src/test/java/org/jbake/app/OvenTest.java
+++ b/jbake-core/src/test/java/org/jbake/app/OvenTest.java
@@ -4,20 +4,23 @@
 import org.jbake.TestUtils;
 import org.jbake.app.configuration.ConfigUtil;
 import org.jbake.app.configuration.DefaultJBakeConfiguration;
-import org.jbake.app.configuration.JBakeProperty;
+import org.jbake.app.configuration.PropertyList;
 import org.jbake.model.DocumentTypes;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.nio.Buffer;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Locale;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -45,7 +48,8 @@ public void setUp() throws Exception {
         sourceFolder = TestUtils.getTestResourcesAsSourceFolder();
         configuration = (DefaultJBakeConfiguration) new ConfigUtil().loadConfig(sourceFolder);
         configuration.setDestinationFolder(output);
-        configuration.setTemplateFolder(new File(sourceFolder, "freemarkerTemplates"));
+        configuration.setTemplateFolder(new File(sourceFolder, "groovyMarkupTemplates"));
+        configuration.setProperty("template.paper.file", "paper.tpl");
     }
 
     @AfterEach
@@ -58,7 +62,7 @@ public void tearDown() {
 
     @Test
     public void bakeWithAbsolutePaths() {
-        configuration.setTemplateFolder(new File(sourceFolder, "freemarkerTemplates"));
+        configuration.setTemplateFolder(new File(sourceFolder, "groovyMarkupTemplates"));
         configuration.setContentFolder(new File(sourceFolder, "content"));
         configuration.setAssetFolder(new File(sourceFolder, "assets"));
 
@@ -110,11 +114,11 @@ public void shouldBakeWithAbsoluteCustomPaths() throws Exception {
 
         BufferedWriter fw = Files.newBufferedWriter(properties);
 
-        fw.write(JBakeProperty.ASSET_FOLDER + "=" + TestUtils.getOsPath(expectedAssetFolder));
+        fw.write(PropertyList.ASSET_FOLDER.getKey() + "=" + TestUtils.getOsPath(expectedAssetFolder));
         fw.newLine();
-        fw.write(JBakeProperty.TEMPLATE_FOLDER + "=" + TestUtils.getOsPath(expectedTemplateFolder));
+        fw.write(PropertyList.TEMPLATE_FOLDER.getKey() + "=" + TestUtils.getOsPath(expectedTemplateFolder));
         fw.newLine();
-        fw.write(JBakeProperty.DESTINATION_FOLDER + "=" + TestUtils.getOsPath(expectedDestination));
+        fw.write(PropertyList.DESTINATION_FOLDER.getKey() + "=" + TestUtils.getOsPath(expectedDestination));
         fw.close();
 
         configuration = (DefaultJBakeConfiguration) new ConfigUtil().loadConfig(source.toFile());
@@ -204,4 +208,25 @@ public void shouldCrawlRenderAndCopyAssets() throws Exception {
         verify(crawler, times(1)).crawl();
         verify(asset, times(1)).copy();
     }
+
+    @Test
+    public void localeConfiguration() throws Exception {
+        String language = configuration.getJvmLocale();
+
+        final Oven oven = new Oven(configuration);
+        oven.bake();
+
+        assertThat(Locale.getDefault(), is(new Locale(language)));
+    }
+
+    @Test
+    public void noLocaleConfiguration() throws Exception {
+        configuration.setProperty(PropertyList.JVM_LOCALE.getKey(), null);
+
+        String language = Locale.getDefault().getLanguage();
+        final Oven oven = new Oven(configuration);
+        oven.bake();
+
+        assertThat(Locale.getDefault(), is(new Locale(language)));
+    }
 }
diff --git a/jbake-core/src/test/java/org/jbake/app/PaginationTest.java b/jbake-core/src/test/java/org/jbake/app/PaginationTest.java
index 90cb1095a..70fefa86a 100644
--- a/jbake-core/src/test/java/org/jbake/app/PaginationTest.java
+++ b/jbake-core/src/test/java/org/jbake/app/PaginationTest.java
@@ -24,6 +24,7 @@
 package org.jbake.app;
 
 import org.jbake.FakeDocumentBuilder;
+import org.jbake.model.DocumentModel;
 import org.jbake.model.DocumentTypes;
 import org.junit.Assert;
 import org.junit.Before;
@@ -31,7 +32,6 @@
 import org.junit.BeforeClass;
 
 import java.util.Calendar;
-import java.util.Date;
 import java.util.Locale;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -63,8 +63,7 @@ public void testPagination() {
         for (int i = 1; i <= TOTAL_POSTS; i++) {
             cal.add(Calendar.SECOND, 5);
             FakeDocumentBuilder builder = new FakeDocumentBuilder("post");
-            builder.withName("dummyfile" + i)
-                    .withCached(true)
+            builder.withCached(true)
                     .withStatus("published")
                     .withDate(cal.getTime())
                     .build();
@@ -81,7 +80,10 @@ public void testPagination() {
             assertThat(posts.size()).isLessThanOrEqualTo(2);
 
             if (posts.size() > 1) {
-                assertThat((Date) posts.get(0).get("date")).isAfter((Date) posts.get(1).get("date"));
+                DocumentModel post = (DocumentModel) posts.get(0);
+                DocumentModel nextPost = (DocumentModel) posts.get(1);
+
+                assertThat(post.getDate()).isAfter(nextPost.getDate());
             }
 
             pageCount++;
diff --git a/jbake-core/src/test/java/org/jbake/app/ParserTest.java b/jbake-core/src/test/java/org/jbake/app/ParserTest.java
index d6d47eb32..ef9f1000b 100644
--- a/jbake-core/src/test/java/org/jbake/app/ParserTest.java
+++ b/jbake-core/src/test/java/org/jbake/app/ParserTest.java
@@ -3,7 +3,8 @@
 import org.jbake.TestUtils;
 import org.jbake.app.configuration.ConfigUtil;
 import org.jbake.app.configuration.DefaultJBakeConfiguration;
-import org.jbake.app.configuration.JBakeProperty;
+import org.jbake.model.DocumentModel;
+import org.jbake.app.configuration.PropertyList;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.junit.Assert;
@@ -17,10 +18,9 @@
 import java.util.AbstractMap.SimpleEntry;
 import java.util.Arrays;
 import java.util.Calendar;
-import java.util.Date;
-import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.jbake.app.configuration.PropertyList.TAG_SANITIZE;
 
 public class ParserTest {
 
@@ -106,6 +106,7 @@ public void createSampleFile() throws Exception {
 
         out = new PrintWriter(validMarkdownFileWithDefaultTypeAndStatus);
         out.println("title=Custom Header separator");
+        out.println("cached=false");
         out.println(config.getHeaderSeparator());
         out.println("# Hello Markdown!");
         out.println("");
@@ -209,14 +210,14 @@ public void createSampleFile() throws Exception {
 
     @Test
     public void parseValidHTMLFile() {
-        Map<String, Object> map = parser.processFile(validHTMLFile);
-        Assert.assertNotNull(map);
-        Assert.assertEquals("draft", map.get("status"));
-        Assert.assertEquals("post", map.get("type"));
-        Assert.assertEquals("This is a Title = This is a valid Title", map.get("title"));
-        Assert.assertNotNull(map.get("date"));
+        DocumentModel documentModel = parser.processFile(validHTMLFile);
+        Assert.assertNotNull(documentModel);
+        Assert.assertEquals("draft", documentModel.getStatus());
+        Assert.assertEquals("post", documentModel.getType());
+        Assert.assertEquals("This is a Title = This is a valid Title", documentModel.getTitle());
+        Assert.assertNotNull(documentModel.getDate());
         Calendar cal = Calendar.getInstance();
-        cal.setTime((Date) map.get("date"));
+        cal.setTime(documentModel.getDate());
         Assert.assertEquals(8, cal.get(Calendar.MONTH));
         Assert.assertEquals(2, cal.get(Calendar.DAY_OF_MONTH));
         Assert.assertEquals(2013, cal.get(Calendar.YEAR));
@@ -225,14 +226,14 @@ public void parseValidHTMLFile() {
 
     @Test
     public void parseInvalidHTMLFile() {
-        Map<String, Object> map = parser.processFile(invalidHTMLFile);
-        Assert.assertNull(map);
+        DocumentModel documentModel = parser.processFile(invalidHTMLFile);
+        Assert.assertNull(documentModel);
     }
 
     @Test
     public void parseInvalidExtension(){
-        Map<String, Object> map = parser.processFile(invalidExtensionFile);
-        Assert.assertNull(map);
+        DocumentModel documentModel = parser.processFile(invalidExtensionFile);
+        Assert.assertNull(documentModel);
     }
 
 
@@ -240,11 +241,11 @@ public void parseInvalidExtension(){
     public void parseMarkdownFileWithCustomHeaderSeparator() {
         config.setHeaderSeparator(customHeaderSeparator);
 
-        Map<String, Object> map = parser.processFile(validMarkdownFileWithCustomHeader);
-        Assert.assertNotNull(map);
-        Assert.assertEquals("draft", map.get("status"));
-        Assert.assertEquals("post", map.get("type"));
-        assertThat(map.get("body").toString())
+        DocumentModel documentModel = parser.processFile(validMarkdownFileWithCustomHeader);
+        Assert.assertNotNull(documentModel);
+        Assert.assertEquals("draft", documentModel.getStatus());
+        Assert.assertEquals("post", documentModel.getType());
+        assertThat(documentModel.getBody())
                 .contains("<p>A paragraph</p>");
 
     }
@@ -253,10 +254,11 @@ public void parseMarkdownFileWithCustomHeaderSeparator() {
     public void parseMarkdownFileWithDefaultStatus() {
         config.setDefaultStatus("published");
 
-        Map<String, Object> map = parser.processFile(validMarkdownFileWithDefaultStatus);
-        Assert.assertNotNull(map);
-        Assert.assertEquals("published", map.get("status"));
-        Assert.assertEquals("post", map.get("type"));
+        DocumentModel documentModel = parser.processFile(validMarkdownFileWithDefaultStatus);
+        Assert.assertNotNull(documentModel);
+        Assert.assertEquals("published", documentModel.getStatus());
+        Assert.assertEquals("post", documentModel.getType());
+        Assert.assertEquals(true, documentModel.getCached());
     }
 
     @Test
@@ -264,10 +266,19 @@ public void parseMarkdownFileWithDefaultTypeAndStatus() {
         config.setDefaultStatus("published");
         config.setDefaultType("page");
 
-        Map<String, Object> map = parser.processFile(validMarkdownFileWithDefaultTypeAndStatus);
-        Assert.assertNotNull(map);
-        Assert.assertEquals("published", map.get("status"));
-        Assert.assertEquals("page", map.get("type"));
+        DocumentModel documentModel = parser.processFile(validMarkdownFileWithDefaultTypeAndStatus);
+        Assert.assertNotNull(documentModel);
+        Assert.assertEquals("published", documentModel.getStatus());
+        Assert.assertEquals("page", documentModel.getType());
+    }
+
+    @Test
+    public void parseMarkdownFileWithDisabledCache() {
+        config.setDefaultStatus("published");
+        config.setDefaultType("page");
+
+        DocumentModel documentModel = parser.processFile(validMarkdownFileWithDefaultTypeAndStatus);
+        Assert.assertEquals(false, documentModel.getCached());
     }
 
     @Test
@@ -275,52 +286,52 @@ public void parseInvalidMarkdownFileWithoutDefaultStatus() {
         config.setDefaultStatus("");
         config.setDefaultType("page");
 
-        Map<String, Object> map = parser.processFile(invalidMarkdownFileWithoutDefaultStatus);
-        Assert.assertNull(map);
+        DocumentModel documentModel = parser.processFile(invalidMarkdownFileWithoutDefaultStatus);
+        Assert.assertNull(documentModel);
     }
 
     @Test
     public void parseInvalidMarkdownFile() {
-        Map<String, Object> map = parser.processFile(invalidMDFile);
-        Assert.assertNull(map);
+        DocumentModel documentModel = parser.processFile(invalidMDFile);
+        Assert.assertNull(documentModel);
     }
 
     @Test
     public void sanitizeKeysAndValues() {
-        Map<String, Object> map = parser.processFile(validaAsciidocWithUnsanitizedHeader);
+        DocumentModel map = parser.processFile(validaAsciidocWithUnsanitizedHeader);
 
-        assertThat(map.get("status")).isEqualTo("draft");
-        assertThat(map.get("title")).isEqualTo("Title");
-        assertThat(map.get("type")).isEqualTo("post");
+        assertThat(map.getStatus()).isEqualTo("draft");
+        assertThat(map.getTitle()).isEqualTo("Title");
+        assertThat(map.getType()).isEqualTo("post");
         assertThat(map.get("custom")).isEqualTo("custom without bom's");
-        assertThat(map.get("tags")).isEqualTo(Arrays.asList("jbake", "java", "tag with space").toArray());
+        assertThat(map.getTags()).isEqualTo(Arrays.asList("jbake", "java", "tag with space").toArray());
     }
 
     @Test
     public void sanitizeTags() {
-        config.setProperty(JBakeProperty.TAG_SANITIZE, true);
-        Map<String, Object> map = parser.processFile(validaAsciidocWithUnsanitizedHeader);
+        config.setProperty(TAG_SANITIZE.getKey(), true);
+        DocumentModel map = parser.processFile(validaAsciidocWithUnsanitizedHeader);
 
-        assertThat(map.get("tags")).isEqualTo(Arrays.asList("jbake", "java", "tag-with-space").toArray());
+        assertThat(map.getTags()).isEqualTo(Arrays.asList("jbake", "java", "tag-with-space").toArray());
     }
 
 
     @Test
     public void parseValidHTMLWithJSONFile() {
-        Map<String, Object> map = parser.processFile(validHTMLWithJSONFile);
-        assertJSONExtracted(map.get("jsondata"));
+        DocumentModel documentModel = parser.processFile(validHTMLWithJSONFile);
+        assertJSONExtracted(documentModel.get("jsondata"));
     }
 
     @Test
     public void parseValidAsciiDocWithJSONFile() {
-        Map<String, Object> map = parser.processFile(validAsciiDocWithJSONFile);
-        assertJSONExtracted(map.get("jsondata"));
+        DocumentModel documentModel = parser.processFile(validAsciiDocWithJSONFile);
+        assertJSONExtracted(documentModel.get("jsondata"));
     }
 
     @Test
     public void testValidAsciiDocWithADHeaderJSONFile() {
-        Map<String, Object> map = parser.processFile(validAsciiDocWithADHeaderJSONFile);
-        assertJSONExtracted(map.get("jsondata"));
+        DocumentModel documentModel = parser.processFile(validAsciiDocWithADHeaderJSONFile);
+        assertJSONExtracted(documentModel.get("jsondata"));
     }
 
     private void assertJSONExtracted(Object jsonDataEntry) {
diff --git a/jbake-core/src/test/java/org/jbake/app/configuration/ConfigUtilTest.java b/jbake-core/src/test/java/org/jbake/app/configuration/ConfigUtilTest.java
index 931cbccb5..e0863e45f 100644
--- a/jbake-core/src/test/java/org/jbake/app/configuration/ConfigUtilTest.java
+++ b/jbake-core/src/test/java/org/jbake/app/configuration/ConfigUtilTest.java
@@ -20,7 +20,9 @@
 import java.nio.file.StandardOpenOption;
 import java.util.List;
 
+import static ch.qos.logback.classic.Level.WARN;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.jbake.TestUtils.getTestResourcesAsSourceFolder;
 import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
@@ -138,8 +140,10 @@ public void shouldGetTemplateFileDoctype() throws Exception {
         JBakeConfiguration config = util.loadConfig(sourceFolder);
 
         File templateFile = config.getTemplateFileByDocType("masterindex");
-
         assertThat(templateFile).isEqualTo(expectedTemplateFile);
+
+        String templateFile2 = config.getTemplateByDocType("team");
+        assertThat(templateFile2).isEqualTo("special/team.tpl");
     }
 
     @Test
@@ -188,7 +192,7 @@ public void shouldReturnConfiguredDocTypes() throws Exception {
 
         List<String> docTypes = config.getDocumentTypes();
 
-        assertThat(docTypes).containsExactly("allcontent", "masterindex", "feed", "archive", "tag", "tagsindex", "sitemap", "post", "page");
+        assertThat(docTypes).containsExactly("allcontent", "team", "masterindex", "feed", "error404", "archive", "tag", "tagsindex", "sitemap", "post", "page");
 
     }
 
@@ -211,9 +215,9 @@ public void shouldReturnAnAsciidoctorOption() throws Exception {
         config.setProperty("asciidoctor.option.requires", "asciidoctor-diagram");
         config.setProperty("asciidoctor.option.template_dirs", "src/template1,src/template2");
 
-        Object option = config.getAsciidoctorOption("requires");
+        List<String> option = config.getAsciidoctorOption("requires");
 
-        assertThat(String.valueOf(option)).contains("asciidoctor-diagram");
+        assertThat(option).contains("asciidoctor-diagram");
     }
 
     @Test
@@ -223,20 +227,19 @@ public void shouldReturnAnAsciidoctorOptionWithAListValue() throws Exception {
         config.setProperty("asciidoctor.option.requires", "asciidoctor-diagram");
         config.setProperty("asciidoctor.option.template_dirs", "src/template1,src/template2");
 
-        Object option = config.getAsciidoctorOption("template_dirs");
+        List<String> option = config.getAsciidoctorOption("template_dirs");
 
-        assertTrue(option instanceof List);
-        assertThat((List<String>) option).contains("src/template1", "src/template2");
+        assertThat(option).contains("src/template1", "src/template2");
     }
 
     @Test
-    public void shouldReturnEmptyStringIfOptionNotAvailable() throws Exception {
+    public void shouldReturnEmptyListIfOptionNotAvailable() throws Exception {
         File sourceFolder = TestUtils.getTestResourcesAsSourceFolder();
         DefaultJBakeConfiguration config = (DefaultJBakeConfiguration) util.loadConfig(sourceFolder);
 
-        Object option = config.getAsciidoctorOption("template_dirs");
+        List<String> options = config.getAsciidoctorOption("template_dirs");
 
-        assertThat(String.valueOf(option)).isEmpty();
+        assertThat(options).isEmpty();
     }
 
     @Test
@@ -299,11 +302,11 @@ void shouldSetCustomFoldersWithAbsolutePaths() throws Exception {
         File properties = source.resolve("jbake.properties").toFile();
         BufferedWriter fw = Files.newBufferedWriter(properties.toPath());
 
-        fw.write(JBakeProperty.ASSET_FOLDER + "=" + TestUtils.getOsPath(expectedAssetFolder));
+        fw.write(PropertyList.ASSET_FOLDER.getKey() + "=" + TestUtils.getOsPath(expectedAssetFolder));
         fw.newLine();
-        fw.write(JBakeProperty.TEMPLATE_FOLDER + "=" + TestUtils.getOsPath(expectedTemplateFolder));
+        fw.write(PropertyList.TEMPLATE_FOLDER.getKey() + "=" + TestUtils.getOsPath(expectedTemplateFolder));
         fw.newLine();
-        fw.write(JBakeProperty.DESTINATION_FOLDER + "=" + TestUtils.getOsPath(expectedDestination));
+        fw.write(PropertyList.DESTINATION_FOLDER.getKey() + "=" + TestUtils.getOsPath(expectedDestination));
         fw.close();
 
         // when
@@ -326,6 +329,45 @@ void shouldSetCustomFoldersWithAbsolutePaths() throws Exception {
         assertThat(contentFolder).isEqualTo(expectedContentFolder.toFile());
     }
 
+    @Test
+    public void shouldUseUtf8EncodingAsDefault() throws Exception{
+        String unicodeString = "中文属性使用默认Properties编码";
+        JBakeConfiguration config = util.loadConfig(TestUtils.getTestResourcesAsSourceFolder());
+
+        String siteAbout = (String) config.get("site.about");
+        assertThat(util.getEncoding()).isEqualTo("UTF-8");
+        assertThat(siteAbout).inUnicode().startsWith(unicodeString);
+    }
+
+    @Test
+    public void shouldBePossibleToSetCustomEncoding() throws Exception {
+        String expected = "Latin1 encoded file äöü";
+        JBakeConfiguration config = util.setEncoding("ISO8859_1").loadConfig(TestUtils.getTestResourcesAsSourceFolder("/fixtureLatin1"));
+
+        String siteAbout = (String) config.get("site.about");
+        assertThat(siteAbout).contains(expected);
+    }
+
+    @Test
+    public void shouldLogAWarningAndFallbackToUTF8IfEncodingIsNotSupported() throws Exception {
+        JBakeConfiguration config = util.setEncoding("UNSUPPORTED_ENCODING").loadConfig(TestUtils.getTestResourcesAsSourceFolder("/fixtureLatin1"));
+        verify(mockAppender, times(1)).doAppend(captorLoggingEvent.capture());
+
+        LoggingEvent loggingEvent = captorLoggingEvent.getValue();
+
+        assertThat(loggingEvent.getLevel()).isEqualTo(WARN);
+        assertThat(loggingEvent.getFormattedMessage()).isEqualTo("Unsupported encoding 'UNSUPPORTED_ENCODING'. Using default encoding 'UTF-8'");
+    }
+
+
+    @Test
+    public void shouldReturnIgnoreFileFromConfiguration() throws Exception {
+        File sourceFolder = TestUtils.getTestResourcesAsSourceFolder();
+        JBakeConfiguration config = util.loadConfig(sourceFolder);
+
+        assertThat(config.getIgnoreFileName()).isEqualTo(".jbakeignore");
+    }
+
     private void assertDefaultPropertiesPresent(JBakeConfiguration config) throws IllegalAccessException {
         for (Field field : JBakeConfiguration.class.getFields()) {
 
diff --git a/jbake-core/src/test/java/org/jbake/app/configuration/JBakeConfigurationFactoryTest.java b/jbake-core/src/test/java/org/jbake/app/configuration/JBakeConfigurationFactoryTest.java
index 0fb609a19..5fd60a39c 100644
--- a/jbake-core/src/test/java/org/jbake/app/configuration/JBakeConfigurationFactoryTest.java
+++ b/jbake-core/src/test/java/org/jbake/app/configuration/JBakeConfigurationFactoryTest.java
@@ -7,12 +7,16 @@
 
 import java.io.File;
 import java.io.FileWriter;
+import java.util.Properties;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 
 public class JBakeConfigurationFactoryTest {
 
-    @TempDir File root;
+    @TempDir
+    File root;
 
     @Test
     public void shouldReturnDefaultConfigurationWithDefaultFolders() throws Exception {
@@ -33,7 +37,7 @@ public void shouldReturnDefaultConfigurationWithDefaultFolders() throws Exceptio
     @Test
     public void shouldReturnDefaultConfigurationWithCustomFolders() throws Exception {
         File sourceFolder = root;
-        File destinationFolder = TestUtils.newFolder(root,"output/custom");
+        File destinationFolder = TestUtils.newFolder(root, "output/custom");
         File templateFolder = TestUtils.newFolder(root, "templates/custom");
         File assetFolder = TestUtils.newFolder(root, "assets/custom");
         File contentFolder = TestUtils.newFolder(root, "content/custom");
@@ -63,12 +67,10 @@ public void shouldReturnDefaultConfigurationWithCustomFolders() throws Exception
     }
 
 
-
-
     @Test
     public void shouldReturnADefaultConfigurationWithSitehost() throws Exception {
         File sourceFolder = root;
-        File destinationFolder = TestUtils.newFolder(root,"output");
+        File destinationFolder = TestUtils.newFolder(root, "output");
         String siteHost = "http://www.jbake.org";
 
         JBakeConfiguration configuration = new JBakeConfigurationFactory().createDefaultJbakeConfiguration(sourceFolder, destinationFolder, true);
@@ -79,7 +81,7 @@ public void shouldReturnADefaultConfigurationWithSitehost() throws Exception {
     @Test
     public void shouldReturnAJettyConfiguration() throws Exception {
         File sourceFolder = root;
-        File destinationFolder = TestUtils.newFolder(root,"output");
+        File destinationFolder = TestUtils.newFolder(root, "output");
         String siteHost = "http://localhost:8820/";
 
         JBakeConfiguration configuration = new JBakeConfigurationFactory().createJettyJbakeConfiguration(sourceFolder, destinationFolder, true);
@@ -87,4 +89,42 @@ public void shouldReturnAJettyConfiguration() throws Exception {
         assertThat(configuration.getSiteHost()).isEqualTo(siteHost);
     }
 
+    @Test
+    public void shouldUseDefaultEncodingUTF8() throws Exception {
+        File sourceFolder = root;
+        File destinationFolder = TestUtils.newFolder(root, "output");
+        JBakeConfigurationFactory factory = new JBakeConfigurationFactory();
+        JBakeConfiguration configuration = factory.createDefaultJbakeConfiguration(sourceFolder, destinationFolder, true);
+
+        assertThat(factory.getConfigUtil().getEncoding()).isEqualTo("UTF-8");
+    }
+
+    @Test
+    public void shouldUseCustomEncoding() throws Exception {
+
+        ConfigUtil util = spy(ConfigUtil.class);
+        File sourceFolder = root;
+        File destinationFolder = TestUtils.newFolder(root, "output");
+        JBakeConfigurationFactory factory = new JBakeConfigurationFactory();
+        factory.setConfigUtil(util);
+        JBakeConfiguration configuration = factory.setEncoding("latin1").createDefaultJbakeConfiguration(sourceFolder, destinationFolder, (File) null,true);
+
+        assertThat(factory.getConfigUtil().getEncoding()).isEqualTo("latin1");
+        verify(util).loadConfig(sourceFolder, null);
+    }
+
+    @Test
+    void shouldBeAbleToAddCustomProperties() {
+        File sourceFolder = root;
+        File destinationFolder = TestUtils.newFolder(root, "output");
+        DefaultJBakeConfiguration config = new JBakeConfigurationFactory().createDefaultJbakeConfiguration(sourceFolder, destinationFolder, true);
+        Properties properties = new Properties();
+        properties.setProperty("custom.key", "custom value");
+        properties.setProperty("custom.key2", "custom value 2");
+
+        config.addConfiguration(properties);
+
+        assertThat(config.get("custom.key")).isEqualTo("custom value");
+        assertThat(config.get("custom.key2")).isEqualTo("custom value 2");
+    }
 }
diff --git a/jbake-core/src/test/java/org/jbake/app/configuration/PropertyListTest.java b/jbake-core/src/test/java/org/jbake/app/configuration/PropertyListTest.java
new file mode 100644
index 000000000..10190307e
--- /dev/null
+++ b/jbake-core/src/test/java/org/jbake/app/configuration/PropertyListTest.java
@@ -0,0 +1,23 @@
+package org.jbake.app.configuration;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class PropertyListTest {
+
+    @Test
+    public void getPropertyByKey() {
+        Property property = PropertyList.getPropertyByKey("archive.file");
+
+        assertThat(property).isEqualTo(PropertyList.ARCHIVE_FILE);
+    }
+
+    @Test
+    public void getCustomProperty() {
+        Property property = PropertyList.getPropertyByKey("unknown.option");
+
+        assertThat(property.getKey()).isEqualTo("unknown.option");
+        assertThat(property.getGroup()).isEqualTo(Property.Group.CUSTOM);
+    }
+}
diff --git a/jbake-core/src/test/java/org/jbake/app/template/AbstractTemplateEngineRenderingTest.java b/jbake-core/src/test/java/org/jbake/app/template/AbstractTemplateEngineRenderingTest.java
index 3c88c8e41..69ee1cab4 100644
--- a/jbake-core/src/test/java/org/jbake/app/template/AbstractTemplateEngineRenderingTest.java
+++ b/jbake-core/src/test/java/org/jbake/app/template/AbstractTemplateEngineRenderingTest.java
@@ -28,6 +28,7 @@
 import org.jbake.app.Crawler;
 import org.jbake.app.Parser;
 import org.jbake.app.Renderer;
+import org.jbake.model.DocumentModel;
 import org.jbake.model.DocumentTypes;
 import org.jbake.template.ModelExtractors;
 import org.jbake.template.ModelExtractorsDocumentTypeListener;
@@ -40,11 +41,7 @@
 
 import java.io.File;
 import java.nio.charset.Charset;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
+import java.util.*;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -85,6 +82,7 @@ public void setup() throws Exception {
         config.setDestinationFolder(destinationFolder);
         config.setTemplateFolder(templateFolder);
 
+
         for (String docType : DocumentTypes.getDocumentTypes()) {
             File templateFile = config.getTemplateFileByDocType(docType);
 
@@ -94,6 +92,11 @@ public void setup() throws Exception {
                 config.setTemplateFileNameForDocType(docType, fileBaseName + "." + templateExtension);
             }
         }
+
+        config.setTemplateFileNameForDocType("paper", "paper." + templateExtension);
+        DocumentTypes.addDocumentType("paper");
+        db.updateSchema();
+
         Assert.assertEquals(".html", config.getOutputExtension());
 
         Crawler crawler = new Crawler(db, config);
@@ -161,8 +164,8 @@ public void renderPost() throws Exception {
 
         File sampleFile = new File(sourceFolder.getPath() + File.separator + "content"
                 + File.separator + "blog" + File.separator + "2013" + File.separator + filename);
-        Map<String, Object> content = parser.processFile(sampleFile);
-        content.put(Crawler.Attributes.URI, "/" + filename);
+        DocumentModel content = parser.processFile(sampleFile);
+        content.setUri("/" + filename);
         renderer.render(content);
         File outputFile = new File(destinationFolder, filename);
         Assert.assertTrue(outputFile.exists());
@@ -180,8 +183,8 @@ public void renderPage() throws Exception {
         String filename = "about.html";
 
         File sampleFile = new File(sourceFolder.getPath() + File.separator + "content" + File.separator + filename);
-        Map<String, Object> content = parser.processFile(sampleFile);
-        content.put(Crawler.Attributes.URI, "/" + filename);
+        DocumentModel content = parser.processFile(sampleFile);
+        content.setUri("/" + filename);
         renderer.render(content);
         File outputFile = new File(destinationFolder, filename);
         Assert.assertTrue(outputFile.exists());
diff --git a/jbake-core/src/test/java/org/jbake/app/template/FreemarkerTemplateEngineRenderingTest.java b/jbake-core/src/test/java/org/jbake/app/template/FreemarkerTemplateEngineRenderingTest.java
index 908dafad3..de138b8c7 100644
--- a/jbake-core/src/test/java/org/jbake/app/template/FreemarkerTemplateEngineRenderingTest.java
+++ b/jbake-core/src/test/java/org/jbake/app/template/FreemarkerTemplateEngineRenderingTest.java
@@ -62,6 +62,8 @@ public void renderPaginatedIndex() throws Exception {
         for (String string : getOutputStrings("index")) {
             assertThat(output).contains(string);
         }
+
+        assertThat(output).contains("Post Url: blog%2F2013%2Fsecond-post.html");
     }
 
     @Test
diff --git a/jbake-core/src/test/java/org/jbake/app/template/GroovyMarkupTemplateEngineRenderingTest.java b/jbake-core/src/test/java/org/jbake/app/template/GroovyMarkupTemplateEngineRenderingTest.java
index 091a03fbf..c40819a19 100644
--- a/jbake-core/src/test/java/org/jbake/app/template/GroovyMarkupTemplateEngineRenderingTest.java
+++ b/jbake-core/src/test/java/org/jbake/app/template/GroovyMarkupTemplateEngineRenderingTest.java
@@ -5,6 +5,7 @@
 import org.jbake.app.DBUtil;
 import org.jbake.app.Parser;
 import org.jbake.app.Renderer;
+import org.jbake.model.DocumentModel;
 import org.jbake.model.DocumentTypes;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -13,20 +14,11 @@
 import java.io.File;
 import java.nio.charset.Charset;
 import java.util.Arrays;
-import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class GroovyMarkupTemplateEngineRenderingTest extends AbstractTemplateEngineRenderingTest {
 
-    @BeforeClass
-    public static void setUpTest() {
-        //switch to PLOCAL mode for this test class as Travis sometimes runs out of memory
-        db.close();
-        config.setDatabaseStore(StorageType.PLOCAL.toString());
-        db = DBUtil.createDataStore(config);
-    }
-
     public GroovyMarkupTemplateEngineRenderingTest() {
         super("groovyMarkupTemplates", "tpl");
 
@@ -64,9 +56,7 @@ public GroovyMarkupTemplateEngineRenderingTest() {
     @Test
     public void renderCustomTypePaper() throws Exception {
         // setup
-        config.setTemplateFileNameForDocType("paper", "paper." + templateExtension);
-        DocumentTypes.addDocumentType("paper");
-        db.updateSchema();
+
 
         Crawler crawler = new Crawler(db, config);
         crawler.crawl();
@@ -75,8 +65,8 @@ public void renderCustomTypePaper() throws Exception {
         String filename = "published-paper.html";
 
         File sampleFile = new File(sourceFolder.getPath() + File.separator + "content" + File.separator + "papers" + File.separator + filename);
-        Map<String, Object> content = parser.processFile(sampleFile);
-        content.put(Crawler.Attributes.URI, "/" + filename);
+        DocumentModel content = parser.processFile(sampleFile);
+        content.setUri("/" + filename);
         renderer.render(content);
         File outputFile = new File(destinationFolder, filename);
         Assert.assertTrue(outputFile.exists());
diff --git a/jbake-core/src/test/java/org/jbake/launcher/LaunchOptionsTest.java b/jbake-core/src/test/java/org/jbake/launcher/LaunchOptionsTest.java
index 78d8060f4..150f9271e 100644
--- a/jbake-core/src/test/java/org/jbake/launcher/LaunchOptionsTest.java
+++ b/jbake-core/src/test/java/org/jbake/launcher/LaunchOptionsTest.java
@@ -1,84 +1,72 @@
 package org.jbake.launcher;
 
+import org.jbake.app.configuration.ConfigUtil;
 import org.junit.Test;
-import org.kohsuke.args4j.CmdLineParser;
+import picocli.CommandLine;
+import picocli.CommandLine.MissingParameterException;
 
 import java.io.File;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 public class LaunchOptionsTest {
 
     @Test
-    public void showHelp() throws Exception {
+    public void showHelp() {
         String[] args = {"-h"};
-        LaunchOptions res = new LaunchOptions();
-        CmdLineParser parser = new CmdLineParser(res);
-        parser.parseArgument(args);
-
+        LaunchOptions res = parseArgs(args);
         assertThat(res.isHelpNeeded()).isTrue();
     }
 
     @Test
-    public void runServer() throws Exception {
+    public void runServer() {
         String[] args = {"-s"};
-        LaunchOptions res = new LaunchOptions();
-        CmdLineParser parser = new CmdLineParser(res);
-        parser.parseArgument(args);
+        LaunchOptions res = parseArgs(args);
 
         assertThat(res.isRunServer()).isTrue();
     }
 
     @Test
-    public void runServerWithFolder() throws Exception {
+    public void runServerWithFolder() {
         String[] args = {"-s", "/tmp"};
-        LaunchOptions res = new LaunchOptions();
-        CmdLineParser parser = new CmdLineParser(res);
-        parser.parseArgument(args);
+        LaunchOptions res = parseArgs(args);
 
         assertThat(res.isRunServer()).isTrue();
         assertThat(res.getSource()).isEqualTo(new File("/tmp"));
     }
 
     @Test
-    public void init() throws Exception {
+    public void init() {
         String[] args = {"-i"};
-        LaunchOptions res = new LaunchOptions();
-        CmdLineParser parser = new CmdLineParser(res);
-        parser.parseArgument(args);
+        LaunchOptions res = parseArgs(args);
 
         assertThat(res.isInit()).isTrue();
         assertThat(res.getTemplate()).isEqualTo("freemarker");
     }
 
     @Test
-    public void initWithTemplate() throws Exception {
+    public void initWithTemplate() {
         String[] args = {"-i", "-t", "foo"};
-        LaunchOptions res = new LaunchOptions();
-        CmdLineParser parser = new CmdLineParser(res);
-        parser.parseArgument(args);
+        LaunchOptions res = parseArgs(args);
 
         assertThat(res.isInit()).isTrue();
         assertThat(res.getTemplate()).isEqualTo("foo");
     }
 
     @Test
-    public void initWithSourceDirectory() throws Exception {
+    public void initWithSourceDirectory() {
         String[] args = {"-i", "/tmp"};
-        LaunchOptions res = new LaunchOptions();
-        CmdLineParser parser = new CmdLineParser(res);
-        parser.parseArgument(args);
+        LaunchOptions res = parseArgs(args);
 
         assertThat(res.isInit()).isTrue();
         assertThat(res.getSourceValue()).isEqualTo("/tmp");
     }
 
     @Test
-    public void initWithTemplateAndSourceDirectory() throws Exception {
+    public void initWithTemplateAndSourceDirectory() {
         String[] args = {"-i", "-t", "foo", "/tmp"};
-        LaunchOptions res = new LaunchOptions();
-        CmdLineParser parser = new CmdLineParser(res);
-        parser.parseArgument(args);
+        LaunchOptions res = parseArgs(args);
 
         assertThat(res.isInit()).isTrue();
         assertThat(res.getTemplate()).isEqualTo("foo");
@@ -86,21 +74,58 @@ public void initWithTemplateAndSourceDirectory() throws Exception {
     }
 
     @Test
-    public void bake() throws Exception {
+    public void shouldThrowAnExceptionCallingTemplateWithoutInitOption() {
+        String[] args = {"-t", "groovy-mte"};
+
+        assertThatExceptionOfType(MissingParameterException.class).isThrownBy(()-> {
+            LaunchOptions res = parseArgs(args);
+        }).withMessage("Error: Missing required argument(s): --init");
+    }
+
+    @Test
+    public void bake() {
         String[] args = {"-b"};
-        LaunchOptions res = new LaunchOptions();
-        CmdLineParser parser = new CmdLineParser(res);
-        parser.parseArgument(args);
+        LaunchOptions res = parseArgs(args);
 
         assertThat(res.isBake()).isTrue();
     }
 
     @Test
-    public void bakeNoArgs() throws Exception {
+    public void listConfig() throws Exception {
+        String[] args = {"-ls"};
+        LaunchOptions res = parseArgs(args);
+
+        assertThat(res.isListConfig()).isTrue();
+    }
+
+    @Test
+    public void listConfigLongOption() throws Exception {
+        String[] args = {"--list-settings"};
+        LaunchOptions res = parseArgs(args);
+
+        assertThat(res.isListConfig()).isTrue();
+    }
+
+    @Test
+    public void customPropertiesEncoding() throws Exception {
+        String[] args = {"--prop-encoding", "utf-16"};
+        LaunchOptions res = parseArgs(args);
+
+        assertThat(res.getPropertiesEncoding()).isEqualTo("utf-16");
+    }
+
+    @Test
+    public void defaultEncodingIsUtf8() throws Exception {
+        String[] args = {};
+        LaunchOptions res = parseArgs(args);
+
+        assertThat(res.getPropertiesEncoding()).isEqualTo("utf-8");
+    }
+
+    @Test
+    public void bakeNoArgs() {
         String[] args = {};
-        LaunchOptions res = new LaunchOptions();
-        CmdLineParser parser = new CmdLineParser(res);
-        parser.parseArgument(args);
+        LaunchOptions res = parseArgs(args);
 
         assertThat(res.isHelpNeeded()).isTrue();
         assertThat(res.isRunServer()).isFalse();
@@ -108,14 +133,13 @@ public void bakeNoArgs() throws Exception {
         assertThat(res.isBake()).isFalse();
         assertThat(res.getSource().getPath()).isEqualTo(System.getProperty("user.dir"));
         assertThat(res.getDestination().getPath()).isEqualTo(System.getProperty("user.dir") + File.separator + "output");
+        assertThat(res.getConfig().getPath()).isEqualTo(System.getProperty("user.dir") + File.separator + ConfigUtil.CONFIG_FILE);
     }
 
     @Test
-    public void bakeWithArgs() throws Exception {
+    public void bakeWithArgs() {
         String[] args = {"/tmp/source", "/tmp/destination"};
-        LaunchOptions res = new LaunchOptions();
-        CmdLineParser parser = new CmdLineParser(res);
-        parser.parseArgument(args);
+        LaunchOptions res = parseArgs(args);
 
         assertThat(res.isHelpNeeded()).isFalse();
         assertThat(res.isRunServer()).isFalse();
@@ -124,4 +148,16 @@ public void bakeWithArgs() throws Exception {
         assertThat(res.getSource()).isEqualTo(new File("/tmp/source"));
         assertThat(res.getDestination()).isEqualTo(new File("/tmp/destination"));
     }
+
+    @Test
+    public void configArg() {
+        String[] args = {"-c", "foo"};
+        LaunchOptions res = parseArgs(args);
+        assertThat(res.getConfig().getAbsoluteFile().toString()).isEqualTo(System.getProperty("user.dir")+ File.separator + "foo");
+
+    }
+
+    private LaunchOptions parseArgs(String[] args) {
+        return CommandLine.populateCommand(new LaunchOptions(), args);
+    }
 }
diff --git a/jbake-core/src/test/java/org/jbake/launcher/MainTest.java b/jbake-core/src/test/java/org/jbake/launcher/MainTest.java
index 827395051..f505b4f23 100644
--- a/jbake-core/src/test/java/org/jbake/launcher/MainTest.java
+++ b/jbake-core/src/test/java/org/jbake/launcher/MainTest.java
@@ -1,9 +1,13 @@
 package org.jbake.launcher;
 
-import ch.qos.logback.classic.spi.LoggingEvent;
-import org.apache.commons.configuration.ConfigurationException;
-import org.itsallcode.junit.sysextensions.ExitGuard;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.PrintStream;
+import java.nio.file.Path;
+
+import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.jbake.TestUtils;
+import org.jbake.app.JBakeException;
 import org.jbake.app.LoggingTest;
 import org.jbake.app.configuration.ConfigUtil;
 import org.jbake.app.configuration.DefaultJBakeConfiguration;
@@ -12,65 +16,93 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.io.TempDir;
-import org.kohsuke.args4j.CmdLineException;
-import org.kohsuke.args4j.CmdLineParser;
 import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
 
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Path;
+import ch.qos.logback.classic.spi.LoggingEvent;
+import picocli.CommandLine;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.itsallcode.junit.sysextensions.AssertExit.assertExitWithStatus;
+import static org.junit.Assert.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@ExtendWith(ExitGuard.class)
-public class MainTest extends LoggingTest {
+class MainTest extends LoggingTest {
 
+    private final PrintStream standardOut = System.out;
+    private final ByteArrayOutputStream outputStreamCaptor = new ByteArrayOutputStream();
     private Main main;
-
-    @Mock private Baker mockBaker;
-    @Mock private JettyServer mockJetty;
-    @Mock private BakeWatcher mockWatcher;
-    @Mock private ConfigUtil configUtil;
-    @Mock private JBakeConfigurationFactory factory;
+    @Mock
+    private Baker mockBaker;
+    @Mock
+    private JettyServer mockJetty;
+    @Mock
+    private BakeWatcher mockWatcher;
+    @Mock
+    private ConfigUtil configUtil;
+    @Mock
+    private JBakeConfigurationFactory factory;
 
     private String workingdir;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         this.main = new Main(mockBaker, mockJetty, mockWatcher);
         workingdir = System.getProperty("user.dir");
         factory.setConfigUtil(configUtil);
         main.setJBakeConfigurationFactory(factory);
+        System.setOut(new PrintStream(outputStreamCaptor));
     }
 
     @AfterEach
-    public void tearDown() {
+    void tearDown() {
         System.setProperty("user.dir", workingdir);
+        System.setOut(standardOut);
     }
 
     @Test
-    public void launchJetty(@TempDir Path source) throws Exception {
-
-        File currentWorkingdir = newFolder(source,"src/jbake");
-        File expectedOutput = new File(currentWorkingdir,"output");
-        JBakeConfiguration configuration = mockJettyConfiguration(currentWorkingdir,expectedOutput);
+    void launchJetty(@TempDir Path source) throws Exception {
+        File currentWorkingdir = newFolder(source, "src/jbake");
+        File expectedOutput = new File(currentWorkingdir, "output");
+        JBakeConfiguration configuration = mockJettyConfiguration(currentWorkingdir, expectedOutput);
 
         String[] args = {"-s"};
         main.run(args);
 
-        verify(mockJetty).run(expectedOutput.getPath(),configuration);
+        verify(mockJetty).run(expectedOutput.getPath(), configuration);
+    }
+
+    @Test
+    public void launchBakeWithCustomPropertiesEncoding(@TempDir Path source) throws Exception {
+        File currentWorkingdir = newFolder(source, "jbake");
+        mockDefaultJbakeConfiguration(currentWorkingdir);
+
+        String[] args = {"-b", "--prop-encoding", "latin1"};
+        main.run(args);
+
+        verify(factory).setEncoding("latin1");
+    }
+
+    @Test
+    public void launchBakeWithDefaultUtf8PropertiesEncoding(@TempDir Path source) throws Exception {
+        File currentWorkingdir = newFolder(source, "jbake");
+        mockDefaultJbakeConfiguration(currentWorkingdir);
+
+        String[] args = {"-b"};
+        main.run(args);
+
+        verify(factory).setEncoding("utf-8");
     }
 
     @Test
-    public void launchBakeAndJetty(@TempDir Path source) throws Exception {
+    void launchBakeAndJetty(@TempDir Path source) throws Exception {
         File sourceFolder = newFolder(source, "src/jbake");
         File expectedOutput = newFolder(sourceFolder.toPath(), "output");
         JBakeConfiguration configuration = mockJettyConfiguration(sourceFolder, expectedOutput);
@@ -78,16 +110,15 @@ public void launchBakeAndJetty(@TempDir Path source) throws Exception {
         String[] args = {"-b", "-s"};
         main.run(args);
 
-        verify(mockJetty).run(expectedOutput.getPath(),configuration);
+        verify(mockJetty).run(expectedOutput.getPath(), configuration);
     }
 
-
     @Test
-    public void launchBakeAndJettyWithCustomDirForJetty(@TempDir Path source) throws ConfigurationException, IOException {
-        File sourceFolder = newFolder(source,"src/jbake");
+    void launchBakeAndJettyWithCustomDirForJetty(@TempDir Path source) throws ConfigurationException {
+        File sourceFolder = newFolder(source, "src/jbake");
         String expectedRunPath = "src" + File.separator + "jbake" + File.separator + "output";
-        File output = newFolder(source,expectedRunPath);
-        JBakeConfiguration configuration = mockJettyConfiguration(sourceFolder,output);
+        File output = newFolder(source, expectedRunPath);
+        JBakeConfiguration configuration = mockJettyConfiguration(sourceFolder, output);
 
         String[] args = {"-b", "-s", "src/jbake"};
         main.run(args);
@@ -96,8 +127,8 @@ public void launchBakeAndJettyWithCustomDirForJetty(@TempDir Path source) throws
     }
 
     @Test
-    public void launchJettyWithCustomServerSourceDir(@TempDir Path output) throws Exception {
-        File build = newFolder(output,"build/jbake");
+    void launchJettyWithCustomServerSourceDir(@TempDir Path output) throws Exception {
+        File build = newFolder(output, "build/jbake");
         JBakeConfiguration configuration = mockJettyConfiguration(build, build);
 
         String[] args = {build.getPath(), "-s"};
@@ -110,9 +141,9 @@ public void launchJettyWithCustomServerSourceDir(@TempDir Path output) throws Ex
     // ATTENTION
     // There ist no extra argument for -s option. you can call jbake -s /customsource or jbake /customsource -s
     @Test
-    public void launchJettyWithCustomDestinationDir(@TempDir Path source) throws Exception {
+    void launchJettyWithCustomDestinationDir(@TempDir Path source) throws Exception {
         File src = newFolder(source, "src/jbake");
-        JBakeConfiguration configuration = mockJettyConfiguration(src,src);
+        JBakeConfiguration configuration = mockJettyConfiguration(src, src);
 
         String[] args = {"-s", src.getPath()};
         main.run(args);
@@ -121,10 +152,10 @@ public void launchJettyWithCustomDestinationDir(@TempDir Path source) throws Exc
     }
 
     @Test
-    public void launchJettyWithCustomSrcAndDestDir(@TempDir Path source, @TempDir Path output) throws Exception {
+    void launchJettyWithCustomSrcAndDestDir(@TempDir Path source, @TempDir Path output) throws Exception {
         File src = newFolder(source, "src/jbake");
         File exampleOutput = output.resolve("build/jbake").toFile();
-        JBakeConfiguration configuration = mockJettyConfiguration(src,exampleOutput);
+        JBakeConfiguration configuration = mockJettyConfiguration(src, exampleOutput);
 
         String[] args = {src.getPath(), exampleOutput.getPath(), "-s"};
         main.run(args);
@@ -133,7 +164,7 @@ public void launchJettyWithCustomSrcAndDestDir(@TempDir Path source, @TempDir Pa
     }
 
     @Test
-    public void launchJettyWithCustomDestViaConfig(@TempDir Path output) throws Exception {
+    void launchJettyWithCustomDestViaConfig(@TempDir Path output) throws Exception {
         String[] args = {"-s"};
         final File exampleOutput = output.resolve("build/jbake").toFile();
         DefaultJBakeConfiguration configuration = stubConfig();
@@ -145,7 +176,7 @@ public void launchJettyWithCustomDestViaConfig(@TempDir Path output) throws Exce
     }
 
     @Test
-    public void launchJettyWithCmdlineOverridingProperties(@TempDir Path source, @TempDir Path output, @TempDir Path target) throws Exception {
+    void launchJettyWithCmdlineOverridingProperties(@TempDir Path source, @TempDir Path output, @TempDir Path target) throws Exception {
         final File src = newFolder(source, "src/jbake");
         final File expectedOutput = newFolder(output, "build/jbake");
         final File configTarget = newFolder(target, "target/jbake");
@@ -159,44 +190,76 @@ public void launchJettyWithCmdlineOverridingProperties(@TempDir Path source, @Te
     }
 
     @Test
-    public void shouldTellUserThatTemplateOptionRequiresInitOption() throws Exception {
+    void shouldTellUserThatTemplateOptionRequiresInitOption() {
 
         String[] args = {"-t", "groovy-mte"};
 
-        assertExitWithStatus(1, ()->Main.main(args));
+        try (MockedStatic<BakeOff> utilities = Mockito.mockStatic(BakeOff.class)) {
+            Main.main(args);
+            verify(mockAppender, times(1)).doAppend(captorLoggingEvent.capture());
+            LoggingEvent loggingEvent = captorLoggingEvent.getValue();
+            assertThat(loggingEvent.getMessage()).isEqualTo("Error: Missing required argument(s): --init");
+            utilities.verify(() -> BakeOff.exit(SystemExit.CONFIGURATION_ERROR.getStatus()));
+        }
+    }
 
-        verify(mockAppender, times(1)).doAppend(captorLoggingEvent.capture());
+    @Test
+    void shouldThrowJBakeExceptionWithSystemExitCodeOnUnexpectedError(@TempDir Path source) throws ConfigurationException {
 
-        LoggingEvent loggingEvent = captorLoggingEvent.getValue();
-        assertThat(loggingEvent.getMessage()).isEqualTo("Invalid commandline arguments: option \"-t (--template)\" requires the option(s) [-i]");
+        Main other = spy(main);
+        File currentWorkingdir = newFolder(source, "jbake");
+        mockDefaultJbakeConfiguration(currentWorkingdir);
+
+        doThrow(new RuntimeException("something went wrong")).when(other).run(any(LaunchOptions.class), any());
+
+        JBakeException e = assertThrows(JBakeException.class, () -> other.run(new String[]{""}));
+
+        assertThat(e.getMessage()).isEqualTo("An unexpected error occurred: something went wrong");
+        assertThat(e.getExit()).isEqualTo(SystemExit.ERROR.getStatus());
     }
 
-    private LaunchOptions stubOptions(String[] args) throws CmdLineException {
-        LaunchOptions res = new LaunchOptions();
-        CmdLineParser parser = new CmdLineParser(res);
-        parser.parseArgument(args);
-        return res;
+    @Test
+    void shouldThrowAJBakeExceptionWithConfigurationErrorIfLoadThrowsAnCompositeException() {
+        when(factory.setEncoding(any())).thenReturn(factory);
+        doThrow(new JBakeException(SystemExit.CONFIGURATION_ERROR, "something went wrong")).when(factory).createDefaultJbakeConfiguration(any(File.class), any(File.class), any(File.class), anyBoolean());
+        JBakeException e = assertThrows(JBakeException.class, () -> main.run(new String[]{"-b"}));
+        assertThat(e.getExit()).isEqualTo(SystemExit.CONFIGURATION_ERROR.getStatus());
+    }
+
+    @Test
+    void shouldListCurrentSettings(@TempDir Path source) throws ConfigurationException {
+        File src = newFolder(source, "src/jbake");
+        mockDefaultJbakeConfiguration(src);
+
+        String[] args = {"-ls"};
+        main.run(args);
+
+        assertThat(outputStreamCaptor.toString()).contains("DEFAULT - Settings");
+    }
+
+    private LaunchOptions stubOptions(String[] args) {
+        return CommandLine.populateCommand(new LaunchOptions(), args);
     }
 
     private DefaultJBakeConfiguration stubConfig() throws ConfigurationException {
         File sourceFolder = TestUtils.getTestResourcesAsSourceFolder();
-        DefaultJBakeConfiguration configuration = (DefaultJBakeConfiguration) new ConfigUtil().loadConfig( sourceFolder );
+        DefaultJBakeConfiguration configuration = (DefaultJBakeConfiguration) new ConfigUtil().loadConfig(sourceFolder);
         configuration.setServerPort(8820);
         return configuration;
     }
 
     private void mockDefaultJbakeConfiguration(File sourceFolder) throws ConfigurationException {
-        DefaultJBakeConfiguration configuration = new JBakeConfigurationFactory().createJettyJbakeConfiguration(sourceFolder,null,false);
+        DefaultJBakeConfiguration configuration = new JBakeConfigurationFactory().createJettyJbakeConfiguration(sourceFolder, null, null, false);
         System.setProperty("user.dir", sourceFolder.getPath());
-
-        when(factory.createJettyJbakeConfiguration(any(File.class),any(File.class),anyBoolean())).thenReturn( configuration );
+        when(factory.setEncoding(any())).thenReturn(factory);
+        when(factory.createDefaultJbakeConfiguration(any(File.class), any(File.class), any(File.class), anyBoolean())).thenReturn(configuration);
     }
 
     private JBakeConfiguration mockJettyConfiguration(File sourceFolder, File destinationFolder) throws ConfigurationException {
-        DefaultJBakeConfiguration configuration = new JBakeConfigurationFactory().createJettyJbakeConfiguration(sourceFolder,destinationFolder,false);
+        DefaultJBakeConfiguration configuration = new JBakeConfigurationFactory().createJettyJbakeConfiguration(sourceFolder, destinationFolder, null, false);
         System.setProperty("user.dir", sourceFolder.getPath());
-
-        when(factory.createJettyJbakeConfiguration(any(File.class),any(File.class),anyBoolean())).thenReturn( configuration );
+        when(factory.createJettyJbakeConfiguration(any(File.class), any(File.class),  any(File.class), anyBoolean())).thenReturn(configuration);
+        when(factory.setEncoding(any())).thenReturn(factory);
         return configuration;
     }
 
diff --git a/jbake-core/src/test/java/org/jbake/render/DocumentsRendererTest.java b/jbake-core/src/test/java/org/jbake/render/DocumentsRendererTest.java
index cc57bab39..5985ccc15 100644
--- a/jbake-core/src/test/java/org/jbake/render/DocumentsRendererTest.java
+++ b/jbake-core/src/test/java/org/jbake/render/DocumentsRendererTest.java
@@ -1,27 +1,28 @@
 package org.jbake.render;
 
 import org.jbake.app.ContentStore;
-import org.jbake.app.Crawler.Attributes;
 import org.jbake.app.DocumentList;
 import org.jbake.app.Renderer;
 import org.jbake.app.configuration.JBakeConfiguration;
+import org.jbake.model.DocumentModel;
 import org.jbake.model.DocumentTypes;
+import org.jbake.model.ModelAttributes;
 import org.jbake.template.RenderingException;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
 import org.junit.rules.ExpectedException;
 import org.mockito.ArgumentCaptor;
-import org.mockito.ArgumentMatchers;
 import org.mockito.Captor;
 import org.mockito.MockitoAnnotations;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
@@ -30,16 +31,14 @@
 
 public class DocumentsRendererTest {
 
-    @Rule
-    public ExpectedException exception = ExpectedException.none();
-    private DocumentsRenderer documentsRenderer;
+    public DocumentsRenderer documentsRenderer;
     private ContentStore db;
     private Renderer renderer;
     private JBakeConfiguration configuration;
-    private DocumentList emptyDocumentList;
+    private DocumentList<DocumentModel> emptyTemplateModelList;
 
     @Captor
-    private ArgumentCaptor<Map<String, Object>> argument;
+    private ArgumentCaptor<DocumentModel> argument;
 
     @Before
     public void setUp() {
@@ -51,13 +50,13 @@ public void setUp() {
         db = mock(ContentStore.class);
         renderer = mock(Renderer.class);
         configuration = mock(JBakeConfiguration.class);
-        emptyDocumentList = new DocumentList();
+        emptyTemplateModelList = new DocumentList<>();
     }
 
     @Test
     public void shouldReturnZeroIfNothingHasRendered() throws Exception {
 
-        when(db.getUnrenderedContent(anyString())).thenReturn(emptyDocumentList);
+        when(db.getUnrenderedContent()).thenReturn(emptyTemplateModelList);
 
         int renderResponse = documentsRenderer.render(renderer, db, configuration);
 
@@ -70,14 +69,13 @@ public void shouldReturnCountOfProcessedDocuments() throws Exception {
         // given:
         DocumentTypes.addDocumentType("customType");
 
-        DocumentList documentList = new DocumentList();
-        documentList.add(emptyDocument());
-        documentList.add(emptyDocument());
+        DocumentList<DocumentModel> templateModelList = new DocumentList<>();
+        templateModelList.add(emptyDocument());
+        templateModelList.add(emptyDocument());
 
-        // return empty DocumentList independent from DocumentType
-        when(db.getUnrenderedContent(anyString())).thenReturn(emptyDocumentList);
         // return given DocumentList for DocumentType 'custom type'
-        when(db.getUnrenderedContent("customType")).thenReturn(documentList);
+        when(db.getUnrenderedContent()).thenReturn(templateModelList);
+        when(db.getAllContent(any())).thenReturn(templateModelList);
 
         // when:
         int renderResponse = documentsRenderer.render(renderer, db, configuration);
@@ -87,94 +85,128 @@ public void shouldReturnCountOfProcessedDocuments() throws Exception {
     }
 
     @Test
-    public void shouldThrowAnExceptionWithCollectedErrorMessages() throws Exception {
+    public void shouldThrowAnExceptionWithCollectedErrorMessages() {
         String fakeExceptionMessage = "fake exception";
-        // expect
-        exception.expect(RenderingException.class);
-        exception.expectMessage(fakeExceptionMessage + "\n" + fakeExceptionMessage);
-
-        // given
-        DocumentTypes.addDocumentType("customType");
-
-        DocumentList documentList = new DocumentList();
-        HashMap<String, Object> document = emptyDocument();
-        HashMap<String, Object> document2 = emptyDocument();
-        documentList.add(document);
-        documentList.add(document2);
-
-        // throw an exception for every call of renderer's render method
-        doThrow(new Exception(fakeExceptionMessage)).when(renderer).render(ArgumentMatchers.<String, Object>anyMap());
-        when(db.getUnrenderedContent(anyString())).thenReturn(emptyDocumentList);
-        when(db.getUnrenderedContent("customType")).thenReturn(documentList);
 
-        // when
-        int renderResponse = documentsRenderer.render(renderer, db, configuration);
-
-        // then
-        assertThat(renderResponse).isEqualTo(2);
+        // expect
+        Assertions.assertThrows(
+            RenderingException.class, () -> {
+
+                // given
+                DocumentTypes.addDocumentType("customType");
+
+                DocumentList<DocumentModel> templateModelList = new DocumentList<>();
+                DocumentModel document = emptyDocument();
+                DocumentModel document2 = emptyDocument();
+                templateModelList.add(document);
+                templateModelList.add(document2);
+
+                // throw an exception for every call of renderer's render method
+                doThrow(new Exception(fakeExceptionMessage)).when(renderer).render(any(DocumentModel.class));
+                when(db.getUnrenderedContent()).thenReturn(templateModelList);
+
+                // when
+                int renderResponse = documentsRenderer.render(renderer, db, configuration);
+
+                // then
+                assertThat(renderResponse).isEqualTo(2);
+            },
+            fakeExceptionMessage + "\n" + fakeExceptionMessage
+        );
     }
 
     @Test
     public void shouldContainPostNavigation() throws Exception {
+        // given
         DocumentTypes.addDocumentType("customType");
 
-        String first = "First Document";
-        String second = "Second Document";
-        String third = "Third Document";
-        String fourth = "Fourth Document";
-
-        DocumentList documents = new DocumentList();
-        documents.add(simpleDocument(fourth));
-        documents.add(simpleDocument(third));
-        documents.add(simpleDocument(second));
-        documents.add(simpleDocument(first));
-
-        when(db.getUnrenderedContent("customType")).thenReturn(documents);
+        String firstTitle = "First Document";
+        DocumentModel firstDoc = simpleDocument(firstTitle, ModelAttributes.Status.PUBLISHED, "page");
+        String secondTitle = "Second Document";
+        DocumentModel secondDoc = simpleDocument(secondTitle, ModelAttributes.Status.PUBLISHED, "post");
+        String thirdTitle = "Third Document";
+        DocumentModel thirdDoc = simpleDocument(thirdTitle, ModelAttributes.Status.PUBLISHED, "page");
+        String fourthTitle = "Fourth Document (draft)";
+        DocumentModel fourthDoc = simpleDocument(fourthTitle, ModelAttributes.Status.DRAFT, "post");
+        String fifthTitle = "Fifth Document";
+        DocumentModel fifthDoc = simpleDocument(fifthTitle, ModelAttributes.Status.PUBLISHED, "page");
+        String sixthTitle = "Sixth Document";
+        DocumentModel sixthDoc = simpleDocument(sixthTitle, ModelAttributes.Status.PUBLISHED, "post");
+        String seventhTitle = "Seventh Document";
+        DocumentModel seventhDoc = simpleDocument(seventhTitle, ModelAttributes.Status.PUBLISHED, "post");
+
+        DocumentList allDocs = new DocumentList();
+        allDocs.add(seventhDoc);
+        allDocs.add(sixthDoc);
+        allDocs.add(fifthDoc);
+        allDocs.add(fourthDoc);
+        allDocs.add(thirdDoc);
+        allDocs.add(secondDoc);
+        allDocs.add(firstDoc);
+
+        DocumentList pageDocs = new DocumentList();
+        pageDocs.add(fifthDoc);
+        pageDocs.add(thirdDoc);
+        pageDocs.add(firstDoc);
+
+        DocumentList postDocs = new DocumentList();
+        postDocs.add(seventhDoc);
+        postDocs.add(sixthDoc);
+        postDocs.add(fourthDoc);
+        postDocs.add(secondDoc);
+
+        when(db.getUnrenderedContent()).thenReturn(allDocs);
+        when(db.getAllContent("page")).thenReturn(pageDocs);
+        when(db.getAllContent("post")).thenReturn(postDocs);
 
+        // when
         int renderResponse = documentsRenderer.render(renderer, db, configuration);
 
-        Map<String, Object> fourthDoc = simpleDocument(fourth);
-        fourthDoc.put("previousContent", simpleDocument(third));
-        fourthDoc.put("nextContent", null);
-
-        Map<String, Object> thirdDoc = simpleDocument(third);
-        thirdDoc.put("nextContent", simpleDocument(fourth));
-        thirdDoc.put("previousContent", simpleDocument(second));
-
-        Map<String, Object> secondDoc = simpleDocument(second);
-        secondDoc.put("nextContent", simpleDocument(third));
-        secondDoc.put("previousContent", simpleDocument(first));
-
-        Map<String, Object> firstDoc = simpleDocument(first);
-        firstDoc.put("nextContent", simpleDocument(second));
-        firstDoc.put("previousContent", null);
-
-        verify(renderer, times(4)).render(argument.capture());
-
-        List<Map<String, Object>> maps = argument.getAllValues();
+        // then
+        verify(renderer, times(7)).render(argument.capture());
+        final Map<String, Map<String, Object>> renderedDocs = asTitleToDocMap(argument.getAllValues());
 
-        assertThat(maps).contains(fourthDoc);
+        // page checks
+        assertDocumentNavigation(renderedDocs.get(fifthTitle), thirdTitle, null);
+        assertDocumentNavigation(renderedDocs.get(thirdTitle), firstTitle, fifthTitle);
+        assertDocumentNavigation(renderedDocs.get(firstTitle), null, thirdTitle);
 
-        assertThat(maps).contains(thirdDoc);
+        // post checks
+        assertDocumentNavigation(renderedDocs.get(seventhTitle), sixthTitle, null);
+        assertDocumentNavigation(renderedDocs.get(sixthTitle), secondTitle, seventhTitle);
+        assertDocumentNavigation(renderedDocs.get(fourthTitle), secondTitle, sixthTitle);
+        assertDocumentNavigation(renderedDocs.get(secondTitle), null, sixthTitle);
 
-        assertThat(maps).contains(secondDoc);
+        assertThat(renderResponse).isEqualTo(7);
+    }
 
-        assertThat(maps).contains(firstDoc);
+    private void assertDocumentNavigation(
+        final Map<String, Object> renderedDoc,
+        final String prevDocumentTitle, String nextDocumentTitle) {
+        assertThat(renderedDoc).flatExtracting(
+            "previousContent." + ModelAttributes.TITLE,
+            "nextContent." + ModelAttributes.TITLE)
+            .containsExactly(prevDocumentTitle, nextDocumentTitle);
+    }
 
-        assertThat(renderResponse).isEqualTo(4);
+    private Map<String, Map<String, Object>> asTitleToDocMap(List<DocumentModel> values) {
+        return values.stream()
+            .collect(Collectors.toMap(doc -> doc.get(ModelAttributes.TITLE).toString(), doc -> doc));
     }
 
-    private HashMap<String, Object> emptyDocument() {
-        return new HashMap<>();
+    private DocumentModel emptyDocument() {
+        return new DocumentModel();
     }
 
-    private Map<String, Object> simpleDocument(String title) {
-        Map<String, Object> simpleDoc = new HashMap<>();
+    private DocumentModel simpleDocument(String title, String status, String docType) {
+        DocumentModel simpleDoc = new DocumentModel();
         String uri = title.replace(" ", "_");
-        simpleDoc.put(Attributes.NO_EXTENSION_URI, uri);
-        simpleDoc.put(Attributes.URI, uri);
-        simpleDoc.put(Attributes.TITLE, title);
+        simpleDoc.setNoExtensionUri(uri);
+        simpleDoc.setUri(uri);
+        simpleDoc.setType(docType);
+        simpleDoc.setTitle(title);
+        simpleDoc.setStatus(status);
         return simpleDoc;
     }
 
-}
\ No newline at end of file
+}
diff --git a/jbake-core/src/test/java/org/jbake/render/Error404RendererTest.java b/jbake-core/src/test/java/org/jbake/render/Error404RendererTest.java
new file mode 100644
index 000000000..24281c526
--- /dev/null
+++ b/jbake-core/src/test/java/org/jbake/render/Error404RendererTest.java
@@ -0,0 +1,96 @@
+package org.jbake.render;
+
+import org.jbake.app.ContentStore;
+import org.jbake.app.Renderer;
+import org.jbake.app.configuration.DefaultJBakeConfiguration;
+import org.jbake.app.configuration.JBakeConfiguration;
+import org.jbake.template.RenderingException;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.never;
+
+public class Error404RendererTest {
+    @Test
+    public void returnsZeroWhenConfigDoesNotRenderError404() throws RenderingException {
+        Error404Renderer renderer = new Error404Renderer();
+
+        JBakeConfiguration configuration = mock(DefaultJBakeConfiguration.class);
+        when(configuration.getRenderError404()).thenReturn(false);
+
+        ContentStore contentStore = mock(ContentStore.class);
+
+        Renderer mockRenderer = mock(Renderer.class);
+        int renderResponse = renderer.render(mockRenderer, contentStore, configuration);
+
+        assertThat(renderResponse).isEqualTo(0);
+    }
+
+    @Test
+    public void doesNotRenderWhenConfigDoesNotRenderError404() throws Exception {
+        Error404Renderer renderer = new Error404Renderer();
+
+        JBakeConfiguration configuration = mock(DefaultJBakeConfiguration.class);
+        when(configuration.getRenderError404()).thenReturn(false);
+
+        ContentStore contentStore = mock(ContentStore.class);
+        Renderer mockRenderer = mock(Renderer.class);
+
+        renderer.render(mockRenderer, contentStore, configuration);
+
+        verify(mockRenderer, never()).renderError404(anyString());
+    }
+
+    @Test
+    public void returnsOneWhenConfigRendersError404() throws RenderingException {
+        Error404Renderer renderer = new Error404Renderer();
+
+        JBakeConfiguration configuration = mock(DefaultJBakeConfiguration.class);
+        when(configuration.getRenderError404()).thenReturn(true);
+
+        ContentStore contentStore = mock(ContentStore.class);
+        Renderer mockRenderer = mock(Renderer.class);
+
+        int renderResponse = renderer.render(mockRenderer, contentStore, configuration);
+
+        assertThat(renderResponse).isEqualTo(1);
+    }
+
+    @Test
+    public void doesRenderWhenConfigDoesNotRenderError404() throws Exception {
+        Error404Renderer renderer = new Error404Renderer();
+        String error404file = "mock404file.html";
+
+        JBakeConfiguration configuration = mock(DefaultJBakeConfiguration.class);
+        when(configuration.getRenderError404()).thenReturn(true);
+        when(configuration.getError404FileName()).thenReturn(error404file);
+
+        ContentStore contentStore = mock(ContentStore.class);
+        Renderer mockRenderer = mock(Renderer.class);
+
+        int renderResponse = renderer.render(mockRenderer, contentStore, configuration);
+
+        verify(mockRenderer, times(1)).renderError404(error404file);
+    }
+
+    @Test(expected = RenderingException.class)
+    public void propogatesRenderingException() throws Exception {
+        Error404Renderer renderer = new Error404Renderer();
+        String error404file = "mock404file.html";
+
+        JBakeConfiguration configuration = mock(DefaultJBakeConfiguration.class);
+        when(configuration.getRenderError404()).thenReturn(true);
+        when(configuration.getError404FileName()).thenReturn(error404file);
+
+        ContentStore contentStore = mock(ContentStore.class);
+        Renderer mockRenderer = mock(Renderer.class);
+
+        doThrow(new Exception()).when(mockRenderer).renderError404(anyString());
+
+        int renderResponse = renderer.render(mockRenderer, contentStore, configuration);
+
+        verify(mockRenderer, never()).renderError404(error404file);
+    }
+}
diff --git a/jbake-core/src/test/java/org/jbake/render/RendererTest.java b/jbake-core/src/test/java/org/jbake/render/RendererTest.java
index a022bd73e..c1cd2f0ce 100644
--- a/jbake-core/src/test/java/org/jbake/render/RendererTest.java
+++ b/jbake-core/src/test/java/org/jbake/render/RendererTest.java
@@ -2,10 +2,10 @@
 
 import org.jbake.TestUtils;
 import org.jbake.app.ContentStore;
-import org.jbake.app.Crawler;
 import org.jbake.app.Renderer;
 import org.jbake.app.configuration.ConfigUtil;
 import org.jbake.app.configuration.DefaultJBakeConfiguration;
+import org.jbake.model.DocumentModel;
 import org.jbake.template.DelegatingTemplateEngine;
 import org.junit.Assume;
 import org.junit.Before;
@@ -18,8 +18,6 @@
 
 import java.io.File;
 import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -65,10 +63,10 @@ public void testRenderFileWorksWhenPathHasDotInButFileDoesNot() throws Exception
         config.setTemplateFolder(folder.newFolder("templates"));
         Renderer renderer = new Renderer(db, config, renderingEngine);
 
-        Map<String, Object> content = new HashMap<>();
-        content.put(Crawler.Attributes.TYPE, "page");
-        content.put(Crawler.Attributes.URI, "/" + FOLDER + "/" + FILENAME);
-        content.put(Crawler.Attributes.STATUS, "published");
+        DocumentModel content = new DocumentModel();
+        content.setType("page");
+        content.setUri("/" + FOLDER + "/" + FILENAME);
+        content.setStatus("published");
 
         renderer.render(content);
 
diff --git a/jbake-core/src/test/java/org/jbake/render/support/MockCompositeConfiguration.java b/jbake-core/src/test/java/org/jbake/render/support/MockCompositeConfiguration.java
index 1fb6de047..6554bf996 100644
--- a/jbake-core/src/test/java/org/jbake/render/support/MockCompositeConfiguration.java
+++ b/jbake-core/src/test/java/org/jbake/render/support/MockCompositeConfiguration.java
@@ -1,6 +1,7 @@
 package org.jbake.render.support;
 
-import org.apache.commons.configuration.CompositeConfiguration;
+
+import org.apache.commons.configuration2.CompositeConfiguration;
 
 public class MockCompositeConfiguration extends CompositeConfiguration {
 
@@ -20,7 +21,7 @@ public MockCompositeConfiguration withInnerString(String string) {
     @Override
     public boolean getBoolean(String key) {
 
-        if ( super.containsKey(key) ) {
+        if (super.containsKey(key)) {
             return super.getBoolean(key);
         }
         return _bool;
diff --git a/jbake-core/src/test/java/org/jbake/template/ModelExtractorsTest.java b/jbake-core/src/test/java/org/jbake/template/ModelExtractorsTest.java
index 9e9138a10..4a98127d5 100644
--- a/jbake-core/src/test/java/org/jbake/template/ModelExtractorsTest.java
+++ b/jbake-core/src/test/java/org/jbake/template/ModelExtractorsTest.java
@@ -91,13 +91,13 @@ public void shouldResetToNonCustomizedExtractors() throws Exception {
         ModelExtractors.getInstance().registerExtractorsForCustomTypes(newDocumentType);
 
         //expect:
-        assertThat(ModelExtractors.getInstance().keySet().size()).isEqualTo(17);
+        assertThat(ModelExtractors.getInstance().keySet().size()).isEqualTo(18);
 
         //when:
         ModelExtractors.getInstance().reset();
 
         //then:
-        assertThat(ModelExtractors.getInstance().keySet().size()).isEqualTo(15);
+        assertThat(ModelExtractors.getInstance().keySet().size()).isEqualTo(16);
 
     }
 }
diff --git a/jbake-core/src/test/java/org/jbake/util/ConfigurationPrinterTest.java b/jbake-core/src/test/java/org/jbake/util/ConfigurationPrinterTest.java
new file mode 100644
index 000000000..8d37c543b
--- /dev/null
+++ b/jbake-core/src/test/java/org/jbake/util/ConfigurationPrinterTest.java
@@ -0,0 +1,43 @@
+package org.jbake.util;
+
+import org.jbake.TestUtils;
+import org.jbake.app.configuration.JBakeConfiguration;
+import org.jbake.app.configuration.JBakeConfigurationFactory;
+import org.junit.jupiter.api.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class ConfigurationPrinterTest {
+
+    @Test
+    void shouldPrintHeader() throws Exception {
+        JBakeConfiguration configuration = new JBakeConfigurationFactory().getConfigUtil().loadConfig(TestUtils.getTestResourcesAsSourceFolder());
+        ByteArrayOutputStream data = new ByteArrayOutputStream();
+        PrintStream out = new PrintStream(data);
+        ConfigurationPrinter printer = new ConfigurationPrinter(configuration, out);
+
+        printer.print();
+
+        assertThat(data.toString()).contains("DEFAULT - Settings");
+        assertThat(data.toString()).contains("CUSTOM - Settings");
+        assertThat(data.toString()).contains("Key");
+        assertThat(data.toString()).contains("Value");
+    }
+
+
+    @Test
+    void shouldPrintKeyAndValue() throws Exception {
+        JBakeConfiguration configuration = new JBakeConfigurationFactory().getConfigUtil().loadConfig(TestUtils.getTestResourcesAsSourceFolder());
+        ByteArrayOutputStream data = new ByteArrayOutputStream();
+        PrintStream out = new PrintStream(data);
+        ConfigurationPrinter printer = new ConfigurationPrinter(configuration, out);
+
+        printer.print();
+
+        assertThat(data.toString()).contains("site.host");
+        assertThat(data.toString()).contains("http://www.jbake.org");
+    }
+}
diff --git a/jbake-core/src/test/java/org/jbake/util/HtmlUtilTest.java b/jbake-core/src/test/java/org/jbake/util/HtmlUtilTest.java
index b4f43e5f3..0d5c4f8cc 100644
--- a/jbake-core/src/test/java/org/jbake/util/HtmlUtilTest.java
+++ b/jbake-core/src/test/java/org/jbake/util/HtmlUtilTest.java
@@ -1,16 +1,12 @@
 package org.jbake.util;
 
 import org.jbake.TestUtils;
-import org.jbake.app.Crawler.Attributes;
 import org.jbake.app.configuration.ConfigUtil;
 import org.jbake.app.configuration.DefaultJBakeConfiguration;
+import org.jbake.model.DocumentModel;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 
@@ -25,14 +21,14 @@ public void setUp() throws Exception {
 
     @Test
     public void shouldNotAddBodyHTMLElement() {
-        Map<String, Object> fileContent = new HashMap<String, Object>();
-        fileContent.put(Attributes.ROOTPATH, "../../../");
-        fileContent.put(Attributes.URI, "blog/2017/05/first_post.html");
-        fileContent.put(Attributes.BODY, "<div> Test <img src='/blog/2017/05/first.jpg' /></div>");
+        DocumentModel fileContent = new DocumentModel();
+        fileContent.setRootPath("../../../");
+        fileContent.setUri("blog/2017/05/first_post.html");
+        fileContent.setBody("<div> Test <img src='/blog/2017/05/first.jpg' /></div>");
 
         HtmlUtil.fixImageSourceUrls(fileContent, config);
 
-        String body = fileContent.get(Attributes.BODY).toString();
+        String body = fileContent.getBody();
 
         assertThat(body).doesNotContain("<body>");
         assertThat(body).doesNotContain("</body>");
@@ -41,15 +37,15 @@ public void shouldNotAddBodyHTMLElement() {
 
     @Test
     public void shouldNotAddSiteHost() {
-        Map<String, Object> fileContent = new HashMap<String, Object>();
-        fileContent.put(Attributes.ROOTPATH, "../../../");
-        fileContent.put(Attributes.URI, "blog/2017/05/first_post.html");
-        fileContent.put(Attributes.BODY, "<div> Test <img src='./first.jpg' /></div>");
+        DocumentModel fileContent = new DocumentModel();
+        fileContent.setRootPath("../../../");
+        fileContent.setUri("blog/2017/05/first_post.html");
+        fileContent.setBody("<div> Test <img src='./first.jpg' /></div>");
         config.setImgPathPrependHost(false);
 
         HtmlUtil.fixImageSourceUrls(fileContent, config);
 
-        String body = fileContent.get(Attributes.BODY).toString();
+        String body = fileContent.getBody();
 
         assertThat(body).contains("src=\"blog/2017/05/first.jpg\"");
 
@@ -57,29 +53,30 @@ public void shouldNotAddSiteHost() {
 
     @Test
     public void shouldAddSiteHostWithRelativeImageToDocument() {
-        Map<String, Object> fileContent = new HashMap<>();
-        fileContent.put(Attributes.ROOTPATH, "../../../");
-        fileContent.put(Attributes.URI, "blog/2017/05/first_post.html");
-        fileContent.put(Attributes.BODY, "<div> Test <img src='img/deeper/underground.jpg' /></div>");
+        DocumentModel fileContent = new DocumentModel();
+        fileContent.setRootPath("../../../");
+        fileContent.setUri("blog/2017/05/first_post.html");
+        fileContent.setBody("<div> Test <img src='img/deeper/underground.jpg' /></div>");
         config.setImgPathPrependHost(true);
 
         HtmlUtil.fixImageSourceUrls(fileContent, config);
 
-        String body = fileContent.get(Attributes.BODY).toString();
+        String body = fileContent.getBody();
 
         assertThat(body).contains("src=\"http://www.jbake.org/blog/2017/05/img/deeper/underground.jpg\"");
     }
 
     @Test
     public void shouldAddContentPath() {
-        Map<String, Object> fileContent = new HashMap<String, Object>();
-        fileContent.put(Attributes.ROOTPATH, "../../../");
-        fileContent.put(Attributes.URI, "blog/2017/05/first_post.html");
-        fileContent.put(Attributes.BODY, "<div> Test <img src='./first.jpg' /></div>");
+        DocumentModel fileContent = new DocumentModel();
+        fileContent.setRootPath("../../../");
+        fileContent.setUri("blog/2017/05/first_post.html");
+        fileContent.setBody("<div> Test <img src='./first.jpg' /></div>");
+        config.setImgPathPrependHost(true);
 
         HtmlUtil.fixImageSourceUrls(fileContent, config);
 
-        String body = fileContent.get(Attributes.BODY).toString();
+        String body = fileContent.getBody();
 
         assertThat(body).contains("src=\"http://www.jbake.org/blog/2017/05/first.jpg\"");
 
@@ -87,14 +84,15 @@ public void shouldAddContentPath() {
 
     @Test
     public void shouldAddContentPathForCurrentDirectory() {
-        Map<String, Object> fileContent = new HashMap<String, Object>();
-        fileContent.put(Attributes.ROOTPATH, "../../../");
-        fileContent.put(Attributes.URI, "blog/2017/05/first_post.html");
-        fileContent.put(Attributes.BODY, "<div> Test <img src='first.jpg' /></div>");
+        DocumentModel fileContent = new DocumentModel();
+        fileContent.setRootPath("../../../");
+        fileContent.setUri("blog/2017/05/first_post.html");
+        fileContent.setBody("<div> Test <img src='first.jpg' /></div>");
+        config.setImgPathPrependHost(true);
 
         HtmlUtil.fixImageSourceUrls(fileContent, config);
 
-        String body = fileContent.get(Attributes.BODY).toString();
+        String body = fileContent.getBody();
 
         assertThat(body).contains("src=\"http://www.jbake.org/blog/2017/05/first.jpg\"");
 
@@ -102,14 +100,14 @@ public void shouldAddContentPathForCurrentDirectory() {
 
     @Test
     public void shouldNotAddRootPath() {
-        Map<String, Object> fileContent = new HashMap<String, Object>();
-        fileContent.put(Attributes.ROOTPATH, "../../../");
-        fileContent.put(Attributes.URI, "blog/2017/05/first_post.html");
-        fileContent.put(Attributes.BODY, "<div> Test <img src='/blog/2017/05/first.jpg' /></div>");
+        DocumentModel fileContent = new DocumentModel();
+        fileContent.setRootPath("../../../");
+        fileContent.setUri("blog/2017/05/first_post.html");
+        fileContent.setBody("<div> Test <img src='/blog/2017/05/first.jpg' /></div>");
 
         HtmlUtil.fixImageSourceUrls(fileContent, config);
 
-        String body = fileContent.get(Attributes.BODY).toString();
+        String body = fileContent.getBody();
 
         assertThat(body).contains("src=\"http://www.jbake.org/blog/2017/05/first.jpg\"");
 
@@ -117,15 +115,15 @@ public void shouldNotAddRootPath() {
 
     @Test
     public void shouldNotAddRootPathForNoExtension() {
-        Map<String, Object> fileContent = new HashMap<String, Object>();
-        fileContent.put(Attributes.ROOTPATH, "../../../");
-        fileContent.put(Attributes.URI, "blog/2017/05/first_post.html");
-        fileContent.put(Attributes.NO_EXTENSION_URI, "blog/2017/05/first_post/");
-        fileContent.put(Attributes.BODY, "<div> Test <img src='/blog/2017/05/first.jpg' /></div>");
+        DocumentModel fileContent = new DocumentModel();
+        fileContent.setRootPath("../../../");
+        fileContent.setUri("blog/2017/05/first_post.html");
+        fileContent.setNoExtensionUri("blog/2017/05/first_post/");
+        fileContent.setBody("<div> Test <img src='/blog/2017/05/first.jpg' /></div>");
 
         HtmlUtil.fixImageSourceUrls(fileContent, config);
 
-        String body = fileContent.get(Attributes.BODY).toString();
+        String body = fileContent.getBody();
 
         assertThat(body).contains("src=\"http://www.jbake.org/blog/2017/05/first.jpg\"");
 
@@ -133,30 +131,30 @@ public void shouldNotAddRootPathForNoExtension() {
 
     @Test
     public void shouldAddContentPathForNoExtension() {
-        Map<String, Object> fileContent = new HashMap<String, Object>();
-        fileContent.put(Attributes.ROOTPATH, "../../../");
-        fileContent.put(Attributes.URI, "blog/2017/05/first_post.html");
-        fileContent.put(Attributes.NO_EXTENSION_URI, "blog/2017/05/first_post/");
-        fileContent.put(Attributes.BODY, "<div> Test <img src='./first.jpg' /></div>");
+        DocumentModel fileContent = new DocumentModel();
+        fileContent.setRootPath("../../../");
+        fileContent.setUri("blog/2017/05/first_post.html");
+        fileContent.setNoExtensionUri("blog/2017/05/first_post/");
+        fileContent.setBody("<div> Test <img src='./first.jpg' /></div>");
 
         HtmlUtil.fixImageSourceUrls(fileContent, config);
 
-        String body = fileContent.get(Attributes.BODY).toString();
+        String body = fileContent.getBody();
 
         assertThat(body).contains("src=\"http://www.jbake.org/blog/2017/05/first.jpg\"");
     }
 
     @Test
     public void shouldNotChangeForHTTP() {
-        Map<String, Object> fileContent = new HashMap<String, Object>();
-        fileContent.put(Attributes.ROOTPATH, "../../../");
-        fileContent.put(Attributes.URI, "blog/2017/05/first_post.html");
-        fileContent.put(Attributes.NO_EXTENSION_URI, "blog/2017/05/first_post/");
-        fileContent.put(Attributes.BODY, "<div> Test <img src='http://example.com/first.jpg' /></div>");
+        DocumentModel fileContent = new DocumentModel();
+        fileContent.setRootPath("../../../");
+        fileContent.setUri("blog/2017/05/first_post.html");
+        fileContent.setNoExtensionUri("blog/2017/05/first_post/");
+        fileContent.setBody("<div> Test <img src='http://example.com/first.jpg' /></div>");
 
         HtmlUtil.fixImageSourceUrls(fileContent, config);
 
-        String body = fileContent.get(Attributes.BODY).toString();
+        String body = fileContent.getBody();
 
         assertThat(body).contains("src=\"http://example.com/first.jpg\"");
 
@@ -164,15 +162,15 @@ public void shouldNotChangeForHTTP() {
 
     @Test
     public void shouldNotChangeForHTTPS() {
-        Map<String, Object> fileContent = new HashMap<String, Object>();
-        fileContent.put(Attributes.ROOTPATH, "../../../");
-        fileContent.put(Attributes.URI, "blog/2017/05/first_post.html");
-        fileContent.put(Attributes.NO_EXTENSION_URI, "blog/2017/05/first_post/");
-        fileContent.put(Attributes.BODY, "<div> Test <img src='https://example.com/first.jpg' /></div>");
+        DocumentModel fileContent = new DocumentModel();
+        fileContent.setRootPath("../../../");
+        fileContent.setUri("blog/2017/05/first_post.html");
+        fileContent.setNoExtensionUri("blog/2017/05/first_post/");
+        fileContent.setBody("<div> Test <img src='https://example.com/first.jpg' /></div>");
 
         HtmlUtil.fixImageSourceUrls(fileContent, config);
 
-        String body = fileContent.get(Attributes.BODY).toString();
+        String body = fileContent.getBody();
 
         assertThat(body).contains("src=\"https://example.com/first.jpg\"");
     }
diff --git a/jbake-core/src/test/resources/fixture/assets/fooignorablefolder/.fooignore b/jbake-core/src/test/resources/fixture/assets/fooignorablefolder/.fooignore
new file mode 100644
index 000000000..e69de29bb
diff --git a/jbake-core/src/test/resources/fixture/assets/fooignorablefolder/file_in_foo_ignored_folder.html b/jbake-core/src/test/resources/fixture/assets/fooignorablefolder/file_in_foo_ignored_folder.html
new file mode 100644
index 000000000..7a285e582
--- /dev/null
+++ b/jbake-core/src/test/resources/fixture/assets/fooignorablefolder/file_in_foo_ignored_folder.html
@@ -0,0 +1,16 @@
+title=Second Post
+date=2013-02-28
+type=post
+tags=blog
+status=published
+og={"description": "Something"}
+~~~~~~
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque vel diam purus. Curabitur ut nisi lacus.
+Nam id nisl quam. Donec a lorem sit amet libero pretium vulputate vel ut purus. Suspendisse leo arcu,
+mattis et imperdiet luctus, pulvinar vitae mi. Quisque fermentum sollicitudin feugiat. Mauris nec leo
+ligula. Vestibulum tristique odio ut risus ultricies a hendrerit quam iaculis. Duis tempor elit sit amet
+ligula vehicula et iaculis sem placerat. Fusce dictum, metus at volutpat lacinia, elit massa auctor risus,
+id auctor arcu enim eu augue. Donec ultrices turpis in mi imperdiet ac venenatis sapien sodales. In
+consequat imperdiet nunc quis bibendum. Nulla semper, erat quis ornare tristique, lectus massa posuere
+libero, ut vehicula lectus nunc ut lorem. Aliquam erat volutpat.
diff --git a/jbake-core/src/test/resources/fixture/assets/ignorablefolder/.jbakeignore b/jbake-core/src/test/resources/fixture/assets/ignorablefolder/.jbakeignore
new file mode 100644
index 000000000..e69de29bb
diff --git a/jbake-core/src/test/resources/fixture/ignorablefolder/file_in_ignored_folder.html b/jbake-core/src/test/resources/fixture/assets/ignorablefolder/file_in_ignored_folder.html
similarity index 100%
rename from jbake-core/src/test/resources/fixture/ignorablefolder/file_in_ignored_folder.html
rename to jbake-core/src/test/resources/fixture/assets/ignorablefolder/file_in_ignored_folder.html
diff --git a/jbake-core/src/test/resources/fixture/content/team.html b/jbake-core/src/test/resources/fixture/content/team.html
new file mode 100644
index 000000000..69047f288
--- /dev/null
+++ b/jbake-core/src/test/resources/fixture/content/team.html
@@ -0,0 +1,7 @@
+title=About
+date=2013-02-27
+type=team
+status=published
+~~~~~~
+
+All about stuff!
diff --git a/jbake-core/src/test/resources/fixture/data/authors.yaml b/jbake-core/src/test/resources/fixture/data/authors.yaml
new file mode 100644
index 000000000..eb3f2bd08
--- /dev/null
+++ b/jbake-core/src/test/resources/fixture/data/authors.yaml
@@ -0,0 +1,23 @@
+authors:
+
+    John Smith:
+        first_name: John
+        last_name: Smith
+        twitter: "@jsmith"
+        facebook: "https://www.facebook.com/jsmith"
+
+    Jane Smith:
+        first_name: Jane
+        last_name: Smith
+        twitter: "@janesmith"
+
+    Joe Bloggs:
+        first_name: Joe
+        last_name: Bloggs
+        twitter: "@jblogs"
+
+    Tom Harry:
+        first_name: Tom
+        last_name: Harry
+        twitter: "@tharry"
+        facebook: "https://www.facebook.com/tharry"
diff --git a/jbake-core/src/test/resources/fixture/data/videos.yaml b/jbake-core/src/test/resources/fixture/data/videos.yaml
new file mode 100644
index 000000000..329b50a53
--- /dev/null
+++ b/jbake-core/src/test/resources/fixture/data/videos.yaml
@@ -0,0 +1,21 @@
+-
+    youtubeId: blK7gxqu2B0
+    title: "Unit testing constraints"
+    author: triceo
+    date: 2021-03009
+    tags:
+        - testing
+
+-
+    youtubeId: gIaHtATz6n8
+    title: "Maintenance scheduling"
+    author: jucui
+    date: 2021-02-24
+    tags:
+        - maintenance scheduling
+
+-
+    youtubeId: LTkoaBk-P6U
+    title: "Vaccination appointment scheduling"
+    author: ge0ffrey
+    date: 2021-02-03
diff --git a/jbake-core/src/test/resources/fixture/freemarkerTemplates/error404.ftl b/jbake-core/src/test/resources/fixture/freemarkerTemplates/error404.ftl
new file mode 100644
index 000000000..9fc79bae0
--- /dev/null
+++ b/jbake-core/src/test/resources/fixture/freemarkerTemplates/error404.ftl
@@ -0,0 +1,8 @@
+<#include "header.ftl">
+
+	<#include "menu.ftl">
+
+	<h1>404 Not found</h1>
+    <h2>The requested page is not found.</h2>
+
+<#include "footer.ftl">
\ No newline at end of file
diff --git a/jbake-core/src/test/resources/fixture/freemarkerTemplates/index.ftl b/jbake-core/src/test/resources/fixture/freemarkerTemplates/index.ftl
index 986219394..89b815758 100644
--- a/jbake-core/src/test/resources/fixture/freemarkerTemplates/index.ftl
+++ b/jbake-core/src/test/resources/fixture/freemarkerTemplates/index.ftl
@@ -11,6 +11,7 @@
     <p>${post.date?string("dd MMMM yyyy")}</p>
     <p>${post.body}</p>
     </#if>
+    <span>Post Url: ${post.uri?url}</span>
 </#list>
 <span>${db.getPublishedPages().size()}</span>
 <hr/>
@@ -23,4 +24,4 @@
 
 <p>Older posts are available in the <a href="/${config.archive_file}">archive</a>.</p>
 
-<#include "footer.ftl">
\ No newline at end of file
+<#include "footer.ftl">
diff --git a/jbake-core/src/test/resources/fixture/groovyMarkupTemplates/error404.tpl b/jbake-core/src/test/resources/fixture/groovyMarkupTemplates/error404.tpl
new file mode 100644
index 000000000..b8af2e0a0
--- /dev/null
+++ b/jbake-core/src/test/resources/fixture/groovyMarkupTemplates/error404.tpl
@@ -0,0 +1,7 @@
+package fixture.groovyMarkupTemplates
+
+layout 'layout/main.tpl',
+        bodyContents: contents {
+            h1('404 Not found')
+            h2('The requested page is not found.')
+        }
diff --git a/jbake-core/src/test/resources/fixture/groovyMarkupTemplates/special/team.tpl b/jbake-core/src/test/resources/fixture/groovyMarkupTemplates/special/team.tpl
new file mode 100644
index 000000000..dde7509f9
--- /dev/null
+++ b/jbake-core/src/test/resources/fixture/groovyMarkupTemplates/special/team.tpl
@@ -0,0 +1,24 @@
+package fixture.groovyMarkupTemplates.special
+
+layout 'layout/main.tpl',
+        bodyContents: contents {
+
+            div(class:"row-fluid marketing"){
+                div(class:"span12"){
+                    h4("${content.title}")
+                    p("${content.body}")
+                }
+            }
+
+            hr()
+
+            h5('Published Pages')
+            published_pages.each {page ->
+                a(href:"${config.site_host}${page.uri}","${page.title}")
+            }
+
+        }
+
+
+
+
diff --git a/jbake-core/src/test/resources/fixture/groovyTemplates/error404.gsp b/jbake-core/src/test/resources/fixture/groovyTemplates/error404.gsp
new file mode 100644
index 000000000..dc788c174
--- /dev/null
+++ b/jbake-core/src/test/resources/fixture/groovyTemplates/error404.gsp
@@ -0,0 +1,4 @@
+%include "header.gsp"%>
+	<h1>404 Not found</h1>
+    <h2>The requested page is not found.</h2>
+<%include "footer.gsp"%>
\ No newline at end of file
diff --git a/jbake-core/src/test/resources/fixture/jadeTemplates/error404.jade b/jbake-core/src/test/resources/fixture/jadeTemplates/error404.jade
new file mode 100644
index 000000000..133ba0107
--- /dev/null
+++ b/jbake-core/src/test/resources/fixture/jadeTemplates/error404.jade
@@ -0,0 +1,5 @@
+extends layout.jade
+
+block content
+    h1 404 Not found
+    h2 The requested page is not found.
\ No newline at end of file
diff --git a/jbake-core/src/test/resources/fixture/jbake.properties b/jbake-core/src/test/resources/fixture/jbake.properties
index d592d7df9..4f181c168 100644
--- a/jbake-core/src/test/resources/fixture/jbake.properties
+++ b/jbake-core/src/test/resources/fixture/jbake.properties
@@ -4,6 +4,7 @@ asset.folder=assets
 render.index=true
 index.file=index.html
 render.feed=true
+render.error404=true
 feed.file=feed.xml
 render.archive=true
 render.encoding=UTF-8
@@ -16,3 +17,6 @@ site.host=http://www.jbake.org
 template.feed.thymeleaf.mode=XML
 template.sitemap.thymeleaf.mode=XML
 template.allcontent.file=allcontent.ftl
+template.team.file=special/team.tpl
+site.about=中文属性使用默认Properties编码(Property value in Chinese will let property `site.about` missing due to Apache Configuration implementation.)
+jvm.locale=fr
diff --git a/jbake-core/src/test/resources/fixture/thymeleafTemplates/error404.thyme b/jbake-core/src/test/resources/fixture/thymeleafTemplates/error404.thyme
new file mode 100644
index 000000000..7173f8c78
--- /dev/null
+++ b/jbake-core/src/test/resources/fixture/thymeleafTemplates/error404.thyme
@@ -0,0 +1,13 @@
+<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-4.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org">
+      <head th:replace="header.thyme::head"/>
+      <body>
+      <div th:replace="header.thyme::top"/>
+
+      <h1>404 Not found</h1>
+      <h2>The requested page is not found.</h2>
+    <div th:replace="footer.thyme::footer"></div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/jbake-core/src/test/resources/fixtureLatin1/jbake.properties b/jbake-core/src/test/resources/fixtureLatin1/jbake.properties
new file mode 100644
index 000000000..3a4908f48
--- /dev/null
+++ b/jbake-core/src/test/resources/fixtureLatin1/jbake.properties
@@ -0,0 +1,19 @@
+template.folder=templates
+content.folder=content
+asset.folder=assets
+render.index=true
+index.file=index.html
+render.feed=true
+feed.file=feed.xml
+render.archive=true
+render.encoding=UTF-8
+archive.file=archive.html
+render.tags=false
+tag.path=tags
+test.property=testing123
+markdown.extensions=HARDWRAPS,AUTOLINKS,FENCED_CODE_BLOCKS,DEFINITIONS
+site.host=http://www.jbake.org
+template.feed.thymeleaf.mode=XML
+template.sitemap.thymeleaf.mode=XML
+template.allcontent.file=allcontent.ftl
+site.about=Latin1 encoded file ���
diff --git a/jbake-core/src/test/resources/logback.xml b/jbake-core/src/test/resources/logback.xml
index 318d5f5c6..da72518ca 100644
--- a/jbake-core/src/test/resources/logback.xml
+++ b/jbake-core/src/test/resources/logback.xml
@@ -12,6 +12,8 @@
   <logger name="org.thymeleaf" level="WARN"/>
   <logger name="org.asciidoctor" level="INFO"/>
   <logger name="org.jbake" level="DEBUG"/>
+  <!-- remove confusing log messages from apache configurations/beanutils -->
+  <logger name="org.apache.commons.beanutils.FluentPropertyBeanIntrospector" level="ERROR"/>
 
   <!-- Strictly speaking, the level attribute is not necessary since -->
   <!-- the level of the root level is set to DEBUG by default.       -->
diff --git a/jbake-dist/build.gradle b/jbake-dist/build.gradle
index 51349a738..4aeb8cc14 100644
--- a/jbake-dist/build.gradle
+++ b/jbake-dist/build.gradle
@@ -1,8 +1,10 @@
-apply from: "$rootDir/gradle/application.gradle"
-apply from: "$rootDir/gradle/sdkman.gradle"
-apply from: "$rootDir/gradle/signing.gradle"
-apply from: "$rootDir/gradle/publishing.gradle"
+plugins {
+    id "org.jbake.convention.java-common"
+    id 'application'
+}
 
+apply from: "$rootDir/gradle/application.gradle"
+apply from: "$rootDir/gradle/release.gradle"
 description = "The binary distribution package that bundles JBake cli"
 
 sourceSets {
@@ -33,12 +35,12 @@ dependencies {
     }
 
     smokeTestImplementation "org.eclipse.jgit:org.eclipse.jgit:$jgitVersion"
-    smokeTestImplementation "org.apache.commons:commons-vfs2:$commonsVfs2Version", optional
+    smokeTestImplementation "org.apache.commons:commons-vfs2:$commonsVfs2Version"
 }
 
 task smokeTest(type: Test, dependsOn: installDist) {
-    group 'Verification'
-    description 'Runs the integration tests.'
+    group = 'Verification'
+    description = 'Runs the integration tests.'
     setTestClassesDirs sourceSets.smokeTest.output.classesDirs
     classpath = sourceSets.smokeTest.runtimeClasspath
     shouldRunAfter test
@@ -47,8 +49,10 @@ task smokeTest(type: Test, dependsOn: installDist) {
 smokeTest {
     testLogging {
         events "passed", "skipped", "failed"
-        exceptionFormat "full"
+        exceptionFormat = "full"
     }
 }
 
 check.dependsOn smokeTest
+
+jar.enabled=false
diff --git a/jbake-dist/src/dist/lib/logging/logback.xml b/jbake-dist/src/dist/lib/logging/logback.xml
index 22cd77f5a..12cd7dc19 100644
--- a/jbake-dist/src/dist/lib/logging/logback.xml
+++ b/jbake-dist/src/dist/lib/logging/logback.xml
@@ -14,6 +14,9 @@
     <logger name="org.eclipse" level="WARN"/>
     <logger name="org.apache" level="WARN"/>
     <logger name="org.jbake" level="INFO"/>
+    <!-- remove confusing log messages from apache configurations/beanutils -->
+    <logger name="org.apache.commons.beanutils.FluentPropertyBeanIntrospector" level="ERROR"/>
+
 
     <!-- Strictly speaking, the level attribute is not necessary since -->
     <!-- the level of the root logger is set to DEBUG by default.       -->
diff --git a/jbake-dist/src/smoke-test/java/org/jbake/BuiltInProjectsTest.java b/jbake-dist/src/smoke-test/java/org/jbake/BuiltInProjectsTest.java
index 30b72db70..84f9ba51a 100644
--- a/jbake-dist/src/smoke-test/java/org/jbake/BuiltInProjectsTest.java
+++ b/jbake-dist/src/smoke-test/java/org/jbake/BuiltInProjectsTest.java
@@ -19,23 +19,10 @@
 @RunWith(Parameterized.class)
 public class BuiltInProjectsTest {
 
-    @Parameters(name = " {0} ")
-    public static Iterable<Object[]> data() {
-        return Arrays.asList(new Object[][] {
-                { "thymeleaf",  "thyme" },
-                { "freemarker", "ftl" },
-                { "jade",       "jade" },
-                { "groovy",     "gsp" },
-                { "groovy-mte", "tpl" }
-        });
-    }
-
     @Parameter
     public String projectName;
-
     @Parameter(1)
     public String extension;
-
     @Rule
     public TemporaryFolder folder = new TemporaryFolder();
     private File projectFolder;
@@ -44,9 +31,20 @@ public static Iterable<Object[]> data() {
     private String jbakeExecutable;
     private BinaryRunner runner;
 
+    @Parameters(name = " {0} ")
+    public static Iterable<Object[]> data() {
+        return Arrays.asList(new Object[][]{
+            {"thymeleaf", "thyme"},
+            {"freemarker", "ftl"},
+            {"jade", "jade"},
+            {"groovy", "gsp"},
+            {"groovy-mte", "tpl"}
+        });
+    }
+
     @Before
     public void setup() throws IOException {
-        if ( Os.isFamily(Os.OS_FAMILY_WINDOWS) ) {
+        if (Os.isFamily(Os.OS_FAMILY_WINDOWS)) {
             jbakeExecutable = new File("build\\install\\jbake\\bin\\jbake.bat").getAbsolutePath();
         } else {
             jbakeExecutable = new File("build/install/jbake/bin/jbake").getAbsolutePath();
@@ -64,15 +62,15 @@ public void shouldBakeWithProject() throws Exception {
     }
 
     private void shouldInitProject(String projectName, String extension) throws IOException, InterruptedException {
-        Process process = runner.runWithArguments(jbakeExecutable,"-i", "-t", projectName);
+        Process process = runner.runWithArguments(jbakeExecutable, "-i", "-t", projectName);
         assertThat(process.exitValue()).isEqualTo(0);
-        assertThat(new File(projectFolder,"jbake.properties")).exists();
+        assertThat(new File(projectFolder, "jbake.properties")).exists();
         assertThat(new File(templateFolder, String.format("index.%s", extension))).exists();
         process.destroy();
     }
 
     private void shouldBakeProject() throws IOException, InterruptedException {
-        Process process = runner.runWithArguments(jbakeExecutable,"-b");
+        Process process = runner.runWithArguments(jbakeExecutable, "-b");
         assertThat(process.exitValue()).isEqualTo(0);
         assertThat(new File(outputFolder, "index.html")).exists();
         process.destroy();
diff --git a/jbake-dist/src/smoke-test/java/org/jbake/ProjectWebsiteTest.java b/jbake-dist/src/smoke-test/java/org/jbake/ProjectWebsiteTest.java
index 561b5a7ae..9ef2d0766 100644
--- a/jbake-dist/src/smoke-test/java/org/jbake/ProjectWebsiteTest.java
+++ b/jbake-dist/src/smoke-test/java/org/jbake/ProjectWebsiteTest.java
@@ -30,7 +30,7 @@ public class ProjectWebsiteTest {
     @Before
     public void setup() throws IOException, GitAPIException {
         Assume.assumeTrue("JDK 7 is not supported for this test", !isJava7());
-        if ( Os.isFamily(Os.OS_FAMILY_WINDOWS) ) {
+        if (Os.isFamily(Os.OS_FAMILY_WINDOWS)) {
             jbakeExecutable = new File("build\\install\\jbake\\bin\\jbake.bat").getAbsolutePath();
         } else {
             jbakeExecutable = new File("build/install/jbake/bin/jbake").getAbsolutePath();
@@ -58,12 +58,12 @@ private void cloneJbakeWebsite() throws GitAPIException {
 
         cmd.call();
 
-        assertThat(new File(projectFolder,"README.md").exists()).isTrue();
+        assertThat(new File(projectFolder, "README.md").exists()).isTrue();
     }
 
     @Test
     public void shouldBakeWebsite() throws IOException, InterruptedException {
-        Process process = runner.runWithArguments(jbakeExecutable,"-b");
+        Process process = runner.runWithArguments(jbakeExecutable, "-b");
         assertThat(process.exitValue()).isEqualTo(0);
         assertThat(new File(outputFolder, "index.html")).exists();
         process.destroy();
diff --git a/jbake-maven-plugin/.gitignore b/jbake-maven-plugin/.gitignore
new file mode 100644
index 000000000..eb5a316cb
--- /dev/null
+++ b/jbake-maven-plugin/.gitignore
@@ -0,0 +1 @@
+target
diff --git a/jbake-maven-plugin/LICENSE.txt b/jbake-maven-plugin/LICENSE.txt
new file mode 100644
index 000000000..261eeb9e9
--- /dev/null
+++ b/jbake-maven-plugin/LICENSE.txt
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/jbake-maven-plugin/README.asciidoc b/jbake-maven-plugin/README.asciidoc
new file mode 100644
index 000000000..dbfebd365
--- /dev/null
+++ b/jbake-maven-plugin/README.asciidoc
@@ -0,0 +1,100 @@
+= JBake Maven Plugin
+Jonathan Bullock
+2021-04-20
+:idprefix:
+
+JBake Maven Plugin is a Maven plugin allowing you to integrate http://jbake.org[JBake] into your projects build. This is the official version published at
+the following Maven coordinates:
+
+----
+<dependency>
+    <groupId>org.jbake</groupId>
+    <artifactId>jbake-maven-plugin</artifactId>
+    <version>...</version>
+</dependency>
+----
+
+The JBake Maven Plugin version now matches the JBake version.
+
+Special thanks must go to the original author of this plugin - https://github.com/aldrinleal[Aldrin Leal].
+
+== Usage
+
+To use JBake Maven Plugin in your build add the plugin into your pom.xml as shown below:
+
+----
+<build>
+...
+    <plugins>
+    ...
+        <plugin>
+            <groupId>org.jbake</groupId>
+            <artifactId>jbake-maven-plugin</artifactId>
+            <version>...</version><!-- Same version as JBake -->
+            <configuration>
+                <!--<inputDirectory>${project.basedir}/src/main/resources</inputDirectory>-->
+                <!--<outputDirectory>${project.build.directory}/classes</outputDirectory>-->
+            </configuration>
+            <executions>
+                <execution>
+                    <id>default-generate</id>
+                    <phase>generate-resources</phase>
+                    <goals>
+                        <goal>generate</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+       ...
+    </plugins>
+...
+</build>
+----
+
+=== Dependencies
+
+The plugin automatically includes all optional dependencies of `jbake-core`,
+including freemarker, thymeleaf, asciidoctor, flexmark (markdown), etc.
+This makes it easy to get started with the plugin.
+It also reduces maintenance when upgrading to a new JBake version,
+because you don't need to align the versions of freemarker, thymeleaf, asciidoctor, flexmark, etc.
+
+However, if you want your build to only download the bare minimum it needs,
+you can use `<exclusions>` to exclude the dependencies you don't need.
+
+An example of the plugin being used can be found in this project: https://github.com/jonbullock/maven-jbake-site[https://github.com/jonbullock/maven-jbake-site]
+
+== Goals
+
+There are 4 goals provided by this plugin:
+
+* `jbake:seed` - seeds your project/site with example content and templates
+* `jbake:generate` - bakes your project/site
+* `jbake:watch` - watches to changes and bakes your site whenever a change is detected
+* `jbake:inline` - bakes, watches and serves out content on http://localhost:8820[http://localhost:8820]
+
+You can also more details on each goal by running the help goal:
+
+----
+$ mvn jbake:help -Ddetail # -DgoalName=[seed|generate|watch|inline]
+----
+
+== Versioning
+
+The project adopts the http://semver.org[Semantic Versioning] spec to maintain an understandable backwards compatibility strategy.
+
+The version format is as follows:
+
+----
+<major>.<minor>.<patch>-<label>
+----
+
+* An increment of the major version represents incompatible API changes.
+* An increment of the minor version represents additional functionality in a backwards-compatible manner.
+* An increment of the patch version represents backwards-compatible bug fixes.
+* Existence of a label represents a pre-release or build metadata.
+
+== Copyright & License
+
+This plugin is licensed under the Apache 2.0 License.
+JBake itself is licensed under the MIT license.
diff --git a/jbake-maven-plugin/build.gradle b/jbake-maven-plugin/build.gradle
new file mode 100644
index 000000000..906364a4b
--- /dev/null
+++ b/jbake-maven-plugin/build.gradle
@@ -0,0 +1,41 @@
+plugins {
+    id 'org.gradlex.maven-plugin-development' version '1.0.3'
+    id "org.jbake.convention.java-common"
+}
+
+group = "org.jbake"
+
+mavenPlugin {
+    helpMojoPackage = 'org.jbake.maven'
+}
+
+apply from: "$rootDir/gradle/maven-publishing.gradle"
+apply from: "$rootDir/gradle/signing.gradle"
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            pom {
+                name = "jbake-maven-plugin"
+
+                licenses {
+                    license {
+                        name = 'Apache License, Version 2.0'
+                        url  = 'https://www.apache.org/licenses/LICENSE-2.0.txt'
+                    }
+                }
+            }
+        }
+    }
+}
+
+checkstyleMain.exclude("org/jbake/maven/HelpMojo.java")
+
+dependencies {
+    implementation project(":jbake-core")
+
+    compileOnly "org.apache.maven:maven-core:$mavenVersion"
+    compileOnly "org.apache.maven.plugin-tools:maven-plugin-annotations:$mavenAnnotationsVersion"
+
+    implementation "com.sparkjava:spark-core:$sparkVersion"
+}
diff --git a/jbake-maven-plugin/gradle.properties b/jbake-maven-plugin/gradle.properties
new file mode 100644
index 000000000..ec2427b8b
--- /dev/null
+++ b/jbake-maven-plugin/gradle.properties
@@ -0,0 +1,2 @@
+name = jbake-maven-plugin
+description = JBake Maven Plugin is a Maven plugin allowing you to integrate JBake into your projects build
diff --git a/jbake-maven-plugin/src/main/java/org/jbake/maven/GenerateMojo.java b/jbake-maven-plugin/src/main/java/org/jbake/maven/GenerateMojo.java
new file mode 100644
index 000000000..a265b4442
--- /dev/null
+++ b/jbake-maven-plugin/src/main/java/org/jbake/maven/GenerateMojo.java
@@ -0,0 +1,98 @@
+package org.jbake.maven;
+
+/*
+ * Copyright 2013 ingenieux Labs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.File;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.apache.maven.project.MavenProject;
+import org.jbake.app.JBakeException;
+import org.jbake.app.Oven;
+import org.jbake.app.configuration.DefaultJBakeConfiguration;
+import org.jbake.app.configuration.JBakeConfiguration;
+import org.jbake.app.configuration.JBakeConfigurationFactory;
+
+/**
+ * Runs jbake on a folder
+ */
+@Mojo(name = "generate", requiresProject = true, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME)
+public class GenerateMojo extends AbstractMojo {
+    @Parameter(defaultValue = "${project}")
+    protected MavenProject project;
+
+    /**
+     * Location of the Output Directory.
+     */
+    @Parameter(property = "jbake.outputDirectory",
+        defaultValue = "${project.build.directory}/${project.build.finalName}",
+        required = true)
+    protected File outputDirectory;
+
+    /**
+     * Location of the Output Directory.
+     */
+    @Parameter(property = "jbake.inputDirectory", defaultValue = "${project.basedir}/src/main/jbake",
+        required = true)
+    protected File inputDirectory;
+
+    /**
+     * Breaks the build when {@code true} and errors occur during baking in JBake oven.
+     */
+    @Parameter(property = "jbake.failOnError", defaultValue = "true")
+    protected boolean failOnError;
+
+    /**
+     * Set if cache is present or clear
+     */
+    @Parameter(property = "jbake.isClearCache", defaultValue = "false", required = true)
+    protected boolean isClearCache;
+
+    public final void execute() throws MojoExecutionException {
+        executeInternal();
+    }
+
+    protected void executeInternal() throws MojoExecutionException {
+        reRender();
+    }
+
+    protected void reRender() throws MojoExecutionException {
+        try {
+            // TODO: At some point, reuse Oven
+            Oven oven = new Oven(createConfiguration());
+            oven.bake();
+            if (failOnError && !oven.getErrors().isEmpty()) {
+                throw new MojoFailureException("Baked with " + oven.getErrors().size() + " errors. Check output above for details!");
+            }
+        } catch (Exception e) {
+            getLog().info("Oops", e);
+
+            throw new MojoExecutionException("Failure when running: ", e);
+        }
+    }
+
+    protected JBakeConfiguration createConfiguration() throws JBakeException {
+        DefaultJBakeConfiguration jBakeConfiguration = new JBakeConfigurationFactory().createDefaultJbakeConfiguration(inputDirectory, outputDirectory, isClearCache);
+        jBakeConfiguration.addConfiguration(this.project.getProperties());
+        return jBakeConfiguration;
+    }
+
+}
diff --git a/jbake-maven-plugin/src/main/java/org/jbake/maven/InlineMojo.java b/jbake-maven-plugin/src/main/java/org/jbake/maven/InlineMojo.java
new file mode 100644
index 000000000..57ee0a011
--- /dev/null
+++ b/jbake-maven-plugin/src/main/java/org/jbake/maven/InlineMojo.java
@@ -0,0 +1,82 @@
+package org.jbake.maven;
+
+/*
+ * Copyright 2013 ingenieux Labs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.jbake.app.JBakeException;
+
+import static spark.Spark.awaitInitialization;
+import static spark.Spark.externalStaticFileLocation;
+import static spark.Spark.init;
+import static spark.Spark.ipAddress;
+import static spark.Spark.port;
+import static spark.Spark.stop;
+
+/**
+ * Runs jbake on a folder while watching and serving a folder with it
+ */
+@Mojo(name = "inline", requiresDirectInvocation = true, requiresProject = false)
+public class InlineMojo extends WatchMojo {
+
+    /**
+     * Listen Port
+     */
+    @Parameter(property = "jbake.listenAddress", defaultValue = "127.0.0.1")
+    private String listenAddress;
+
+    /**
+     * Index File
+     */
+    @Parameter(property = "jbake.indexFile", defaultValue = "index.html")
+    private String indexFile;
+
+    /**
+     * Listen Port
+     */
+    @Parameter(property = "jbake.port")
+    private Integer port;
+
+    private int getPort() {
+        if (this.port == null) {
+            try {
+                return createConfiguration().getServerPort();
+            } catch (JBakeException e) {
+                // ignore since default will be returned
+            }
+        } else {
+            return this.port;
+        }
+        return 8820;
+    }
+
+    protected void stopServer() throws MojoExecutionException {
+        stop();
+    }
+
+    protected void initServer() throws MojoExecutionException {
+        externalStaticFileLocation(outputDirectory.getPath());
+
+        ipAddress(listenAddress);
+        port(getPort());
+
+        init();
+
+        awaitInitialization();
+    }
+}
diff --git a/jbake-maven-plugin/src/main/java/org/jbake/maven/SeedMojo.java b/jbake-maven-plugin/src/main/java/org/jbake/maven/SeedMojo.java
new file mode 100644
index 000000000..fe8bdd46b
--- /dev/null
+++ b/jbake-maven-plugin/src/main/java/org/jbake/maven/SeedMojo.java
@@ -0,0 +1,122 @@
+package org.jbake.maven;
+
+/*
+ * Copyright 2013 ingenieux Labs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.util.LinkedList;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+
+import static java.lang.String.format;
+import static java.util.Arrays.asList;
+import static org.apache.commons.lang3.StringUtils.join;
+
+/**
+ * Seeds a new JBake Template into the (non-existing) directory defined by outputDirectory
+ */
+@Mojo(name = "seed", requiresProject = true, requiresDirectInvocation = true)
+public class SeedMojo extends AbstractMojo {
+    /**
+     * Location of the Seeding Zip
+     */
+    @Parameter(property = "jbake.seedUrl", defaultValue = "https://github.com/jbake-org/jbake-template-bootstrap/zipball/master/", required = true)
+    protected String seedUrl;
+
+    /**
+     * Location of the Output Directory.
+     */
+    @Parameter(property = "jbake.outputDirectory", defaultValue = "${project.basedir}/src/main/jbake", required = true)
+    protected File outputDirectory;
+
+    /**
+     * Really force overwrite if output dir exists? defaults to false
+     */
+    @Parameter(property = "jbake.force", defaultValue = "false")
+    protected Boolean force;
+
+    public void execute() throws MojoExecutionException {
+        if (outputDirectory.exists() && (!force)) {
+            throw new MojoExecutionException(format("The outputDirectory %s must *NOT* exist. Invoke with jbake.force as true to disregard", outputDirectory.getName()));
+        }
+
+        try {
+            URL url = new URL(seedUrl);
+            File tmpZipFile = File.createTempFile("jbake", ".zip");
+
+            getLog().info(format("Downloading contents from %s into %s", seedUrl, tmpZipFile));
+
+            final FileOutputStream fos = new FileOutputStream(tmpZipFile);
+            int length = IOUtils.copy(url.openStream(), fos);
+
+            fos.close();
+
+            getLog().info(format("%d bytes downloaded. Unpacking into %s", length, outputDirectory));
+
+            unpackZip(tmpZipFile);
+        } catch (Exception e) {
+            getLog().info("Oops", e);
+            throw new MojoExecutionException("Failure when running: ", e);
+        }
+    }
+
+    private void unpackZip(File tmpZipFile) throws IOException {
+        ZipInputStream zis =
+            new ZipInputStream(new FileInputStream(tmpZipFile));
+        //get the zipped file list entry
+        ZipEntry ze = zis.getNextEntry();
+
+        while (ze != null) {
+            if (ze.isDirectory()) {
+                ze = zis.getNextEntry();
+                continue;
+            }
+
+            String fileName = stripLeadingPath(ze.getName());
+            File newFile = new File(outputDirectory + File.separator + fileName);
+
+            new File(newFile.getParent()).mkdirs();
+
+            FileOutputStream fos = new FileOutputStream(newFile);
+
+            IOUtils.copy(zis, fos);
+
+            fos.close();
+            ze = zis.getNextEntry();
+        }
+
+        zis.closeEntry();
+        zis.close();
+    }
+
+    private String stripLeadingPath(String name) {
+        LinkedList<String> elements = new LinkedList<>(asList(name.split("/")));
+
+        elements.pop();
+
+        return join(elements.iterator(), '/');
+    }
+}
diff --git a/jbake-maven-plugin/src/main/java/org/jbake/maven/WatchMojo.java b/jbake-maven-plugin/src/main/java/org/jbake/maven/WatchMojo.java
new file mode 100644
index 000000000..2bb57f0ae
--- /dev/null
+++ b/jbake-maven-plugin/src/main/java/org/jbake/maven/WatchMojo.java
@@ -0,0 +1,112 @@
+package org.jbake.maven;
+
+/*
+ * Copyright 2013 ingenieux Labs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.jbake.maven.util.DirWatcher;
+
+import static org.apache.commons.lang3.StringUtils.isBlank;
+
+/**
+ * Runs jbake on a folder while watching for changes
+ */
+@Mojo(name = "watch", requiresDirectInvocation = true, requiresProject = false)
+public class WatchMojo extends GenerateMojo {
+
+    public void executeInternal() throws MojoExecutionException {
+        reRender();
+
+        Long lastProcessed = System.currentTimeMillis();
+
+        getLog().info(
+            "Now listening for changes on path " + inputDirectory.getPath());
+
+        initServer();
+
+        DirWatcher dirWatcher = null;
+
+        try {
+            dirWatcher = new DirWatcher(inputDirectory);
+            final AtomicBoolean done = new AtomicBoolean(false);
+            final BufferedReader reader = new BufferedReader(
+                new InputStreamReader(System.in));
+
+            (new Thread() {
+                @Override
+                public void run() {
+                    try {
+                        getLog()
+                            .info("Running. Enter a blank line to finish. Anything else forces re-rendering.");
+
+                        while (true) {
+                            String line = reader.readLine();
+
+                            if (isBlank(line)) {
+                                break;
+                            }
+
+                            reRender();
+                        }
+                    } catch (Exception exc) {
+                        getLog().info("Ooops", exc);
+                    } finally {
+                        done.set(true);
+                    }
+                }
+            }).start();
+
+            dirWatcher.start();
+
+            do {
+                Long result = dirWatcher.processEvents();
+
+                if (null == result) {
+                    // do nothing on purpose
+                } else if (result >= lastProcessed) {
+                    getLog().info("Refreshing");
+
+                    super.reRender();
+
+                    lastProcessed = Long.valueOf(System.currentTimeMillis());
+                }
+            } while (!done.get());
+        } catch (Exception exc) {
+            getLog().info("Oops", exc);
+
+            throw new MojoExecutionException("Oops", exc);
+        } finally {
+            getLog().info("Finishing");
+
+            if (null != dirWatcher) {
+                dirWatcher.stop();
+            }
+
+            stopServer();
+        }
+    }
+
+    protected void stopServer() throws MojoExecutionException {
+    }
+
+    protected void initServer() throws MojoExecutionException {
+    }
+}
diff --git a/jbake-maven-plugin/src/main/java/org/jbake/maven/util/DirWatcher.java b/jbake-maven-plugin/src/main/java/org/jbake/maven/util/DirWatcher.java
new file mode 100644
index 000000000..240792e39
--- /dev/null
+++ b/jbake-maven-plugin/src/main/java/org/jbake/maven/util/DirWatcher.java
@@ -0,0 +1,70 @@
+package org.jbake.maven.util;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.commons.io.monitor.FileAlterationListenerAdaptor;
+import org.apache.commons.io.monitor.FileAlterationMonitor;
+import org.apache.commons.io.monitor.FileAlterationObserver;
+
+/**
+ * Example to watch a directory (or tree) for changes to files.
+ */
+
+public class DirWatcher {
+
+    private final FileAlterationObserver observer;
+
+    private final FileAlterationMonitor monitor;
+
+    private final BlockingQueue<Long> changeQueue = new ArrayBlockingQueue<Long>(1);
+
+    /**
+     * Creates a WatchService and registers the given directory
+     */
+    public DirWatcher(File dir) throws IOException {
+        this.observer = new FileAlterationObserver(dir);
+        this.monitor = new FileAlterationMonitor(1000, observer);
+
+        observer.addListener(new FileAlterationListenerAdaptor() {
+            @Override
+            public void onFileCreate(File file) {
+                onUpdated();
+            }
+
+            @Override
+            public void onFileChange(File file) {
+                onUpdated();
+            }
+        });
+    }
+
+    public void start() throws Exception {
+        monitor.start();
+    }
+
+    public void stop() {
+        try {
+            monitor.stop();
+        } catch (Exception exc) {
+        }
+    }
+
+    private void onUpdated() {
+        try {
+            changeQueue.put(Long.valueOf(System.currentTimeMillis()));
+        } catch (InterruptedException iex) {
+            Thread.currentThread().interrupt();
+        }
+    }
+
+    /**
+     * Process all events for keys queued to the watcher
+     */
+    public Long processEvents() throws InterruptedException {
+        return changeQueue.poll(1, TimeUnit.SECONDS);
+    }
+}
diff --git a/jbake-maven-plugin/src/main/resources/META-INF/plexus/components.xml b/jbake-maven-plugin/src/main/resources/META-INF/plexus/components.xml
new file mode 100644
index 000000000..b8cbddd62
--- /dev/null
+++ b/jbake-maven-plugin/src/main/resources/META-INF/plexus/components.xml
@@ -0,0 +1,28 @@
+<component-set>
+    <components>
+        <component>
+            <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+            <role-hint>jbake</role-hint>
+            <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+            <configuration>
+                <lifecycles>
+                    <lifecycle>
+                        <id>default</id>
+                        <phases>
+                            <process-resources>${project.groupId}:${project.artifactId}:${project.version}:generate</process-resources>
+                        </phases>
+                    </lifecycle>
+                    <lifecycle>
+                        <id>site</id>
+                        <phases>
+                            <pre-site></pre-site>
+                            <site>${project.groupId}:${project.artifactId}:${project.version}:generate</site>
+                            <post-site></post-site>
+                            <site-deploy></site-deploy>
+                        </phases>
+                    </lifecycle>
+                </lifecycles>
+            </configuration>
+        </component>
+    </components>
+</component-set>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 6af1a1acd..82814f392 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
 rootProject.name = 'jbake-base'
 include 'jbake-core'
 include 'jbake-dist'
-
+include 'jbake-maven-plugin'