diff --git a/composer.json b/composer.json
index 0da6444..543f94c 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
 		"ext-gd": "*",
 		"ext-mbstring": "*",
 		"silverstripe/docsviewer": "^2.0@rc",
-		"silverstripe/framework": "^3.2",
+		"silverstripe/framework": "~3.6",
 		"silverstripe/toolbar": "^4.2",
 		"silverstripe/dynamodb": "^1.1",
 		"mandrew/silverstripe-quickfeedback": "^0.2",
diff --git a/composer.lock b/composer.lock
index 476b0bb..128dd35 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "cfc22fd0d8d5290046b5a5e43d0ef990",
-    "content-hash": "3e089a4d1755a301b0b42f28b0825fba",
+    "content-hash": "1d2f6da0ba93e21841fdd1d85a5d60cd",
     "packages": [
         {
             "name": "aws/aws-sdk-php",
@@ -68,7 +67,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2016-07-25 18:03:20"
+            "time": "2016-07-25T18:03:20+00:00"
         },
         {
             "name": "composer/installers",
@@ -175,7 +174,7 @@
                 "zend",
                 "zikula"
             ],
-            "time": "2016-08-13 20:53:52"
+            "time": "2016-08-13T20:53:52+00:00"
         },
         {
             "name": "doctrine/cache",
@@ -245,7 +244,7 @@
                 "cache",
                 "caching"
             ],
-            "time": "2016-10-29 11:16:17"
+            "time": "2016-10-29T11:16:17+00:00"
         },
         {
             "name": "erusev/parsedown",
@@ -284,7 +283,7 @@
                 "markdown",
                 "parser"
             ],
-            "time": "2014-11-29 02:29:14"
+            "time": "2014-11-29T02:29:14+00:00"
         },
         {
             "name": "erusev/parsedown-extra",
@@ -328,7 +327,7 @@
                 "parsedown",
                 "parser"
             ],
-            "time": "2014-09-16 11:54:01"
+            "time": "2014-09-16T11:54:01+00:00"
         },
         {
             "name": "guzzle/guzzle",
@@ -424,7 +423,7 @@
                 "web service"
             ],
             "abandoned": "guzzlehttp/guzzle",
-            "time": "2015-03-18 18:23:50"
+            "time": "2015-03-18T18:23:50+00:00"
         },
         {
             "name": "mandrew/silverstripe-quickfeedback",
@@ -463,7 +462,7 @@
                 "member",
                 "silverstripe"
             ],
-            "time": "2016-02-18 04:32:50"
+            "time": "2016-02-18T04:32:50+00:00"
         },
         {
             "name": "mindscape/raygun4php",
@@ -513,7 +512,7 @@
                 "logging",
                 "raygun"
             ],
-            "time": "2017-03-06 22:37:27"
+            "time": "2017-03-06T22:37:27+00:00"
         },
         {
             "name": "mnapoli/front-yaml",
@@ -547,7 +546,7 @@
             "license": [
                 "MIT"
             ],
-            "time": "2016-10-01 11:06:51"
+            "time": "2016-10-01T11:06:51+00:00"
         },
         {
             "name": "mtdowling/cron-expression",
@@ -591,7 +590,57 @@
                 "cron",
                 "schedule"
             ],
-            "time": "2016-01-26 21:23:30"
+            "time": "2016-01-26T21:23:30+00:00"
+        },
+        {
+            "name": "mustangostang/spyc",
+            "version": "0.6.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mustangostang/spyc.git",
+                "reference": "23c35ae854d835f2d7bcc3e3ad743d7e57a8c14d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mustangostang/spyc/zipball/23c35ae854d835f2d7bcc3e3ad743d7e57a8c14d",
+                "reference": "23c35ae854d835f2d7bcc3e3ad743d7e57a8c14d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.3.*@dev"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.5.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "Spyc.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "mustangostang",
+                    "email": "vlad.andersen@gmail.com"
+                }
+            ],
+            "description": "A simple YAML loader/dumper class for PHP",
+            "homepage": "https://github.com/mustangostang/spyc/",
+            "keywords": [
+                "spyc",
+                "yaml",
+                "yml"
+            ],
+            "time": "2017-02-24T16:06:33+00:00"
         },
         {
             "name": "silverstripe/crontask",
@@ -634,7 +683,7 @@
                 "cron",
                 "silverstripe"
             ],
-            "time": "2016-09-13 10:39:18"
+            "time": "2016-09-13T10:39:18+00:00"
         },
         {
             "name": "silverstripe/docsviewer",
@@ -676,7 +725,7 @@
                 "documentation",
                 "silverstripe"
             ],
-            "time": "2018-01-29 00:44:30"
+            "time": "2018-01-29T00:44:30+00:00"
         },
         {
             "name": "silverstripe/dynamodb",
@@ -717,38 +766,69 @@
                 "dynamodb",
                 "silverstripe"
             ],
-            "time": "2016-03-03 21:34:17"
+            "time": "2016-03-03T21:34:17+00:00"
         },
         {
             "name": "silverstripe/framework",
-            "version": "3.5.0",
+            "version": "3.6.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/silverstripe/silverstripe-framework.git",
-                "reference": "179996b5f9ccbaab8882cafbf16c389623521b72"
+                "reference": "91327ab63e8c0361ce9e3af007b4a047314cd4c2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/179996b5f9ccbaab8882cafbf16c389623521b72",
-                "reference": "179996b5f9ccbaab8882cafbf16c389623521b72",
+                "url": "https://api.github.com/repos/silverstripe/silverstripe-framework/zipball/91327ab63e8c0361ce9e3af007b4a047314cd4c2",
+                "reference": "91327ab63e8c0361ce9e3af007b4a047314cd4c2",
                 "shasum": ""
             },
             "require": {
                 "composer/installers": "~1.0",
-                "php": ">=5.3.3,<7"
+                "mustangostang/spyc": "^0.6.2",
+                "php": ">= 5.3.3, <7.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "~3.7"
+                "phpunit/phpunit": "^3 || ^4 || ^5"
             },
             "type": "silverstripe-module",
             "extra": {
                 "branch-alias": {
-                    "3.x-dev": "3.5.x-dev"
+                    "3.x-dev": "3.6.x-dev"
                 }
             },
             "autoload": {
+                "psr-0": {
+                    "SilverStripe\\": "src/",
+                    "Zend_": "thirdparty/Zend/"
+                },
                 "classmap": [
-                    "tests/behat/features/bootstrap"
+                    "tests/behat/features/bootstrap",
+                    "admin/code",
+                    "api",
+                    "cache",
+                    "cli",
+                    "control",
+                    "core",
+                    "dev",
+                    "email",
+                    "filesystem",
+                    "forms",
+                    "i18n",
+                    "model",
+                    "oembed",
+                    "parsers",
+                    "search",
+                    "security",
+                    "tasks",
+                    "view",
+                    "thirdparty/php-peg",
+                    "thirdparty/simpletest",
+                    "thirdparty/zend_translate_railsyaml"
+                ],
+                "exclude-from-classmap": [
+                    "view/SSTemplateParser.php.inc",
+                    "dev/phpunit/PhpUnitWrapper.php",
+                    "model/fieldtypes/compat"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -771,7 +851,7 @@
                 "framework",
                 "silverstripe"
             ],
-            "time": "2016-11-28 12:35:19"
+            "time": "2018-05-13T22:59:58+00:00"
         },
         {
             "name": "silverstripe/raygun",
@@ -809,7 +889,7 @@
                 "raygun",
                 "silverstripe"
             ],
-            "time": "2017-04-04 01:26:23"
+            "time": "2017-04-04T01:26:23+00:00"
         },
         {
             "name": "silverstripe/toolbar",
@@ -853,7 +933,7 @@
                 "source": "https://github.com/silverstripe/silverstripe-globaltoolbar/tree/4.2.0",
                 "issues": "https://github.com/silverstripe/silverstripe-globaltoolbar/issues"
             },
-            "time": "2016-10-14 02:05:33"
+            "time": "2016-10-14T02:05:33+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -913,7 +993,7 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2016-10-13 01:43:15"
+            "time": "2016-10-13T01:43:15+00:00"
         },
         {
             "name": "symfony/yaml",
@@ -962,7 +1042,7 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2016-11-14 16:15:57"
+            "time": "2016-11-14T16:15:57+00:00"
         },
         {
             "name": "unclecheese/display-logic",
@@ -1006,7 +1086,7 @@
                 "logic",
                 "silverstripe"
             ],
-            "time": "2016-06-21 00:24:32"
+            "time": "2016-06-21T00:24:32+00:00"
         }
     ],
     "packages-dev": [
@@ -1069,7 +1149,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2014-09-02 10:13:14"
+            "time": "2014-09-02T10:13:14+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -1116,7 +1196,7 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2016-10-03 07:40:28"
+            "time": "2016-10-03T07:40:28+00:00"
         },
         {
             "name": "phpunit/php-text-template",
@@ -1157,7 +1237,7 @@
             "keywords": [
                 "template"
             ],
-            "time": "2015-06-21 13:50:34"
+            "time": "2015-06-21T13:50:34+00:00"
         },
         {
             "name": "phpunit/php-timer",
@@ -1201,7 +1281,7 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2016-05-12 18:03:57"
+            "time": "2016-05-12T18:03:57+00:00"
         },
         {
             "name": "phpunit/php-token-stream",
@@ -1251,7 +1331,7 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2014-03-03 05:10:30"
+            "time": "2014-03-03T05:10:30+00:00"
         },
         {
             "name": "phpunit/phpunit",
@@ -1324,7 +1404,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2014-10-17 09:04:17"
+            "time": "2014-10-17T09:04:17+00:00"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -1373,7 +1453,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2013-01-13 10:24:48"
+            "time": "2013-01-13T10:24:48+00:00"
         }
     ],
     "aliases": [],