diff --git a/docs/docs/reference/api.md b/docs/docs/reference/api.md
index 1e4848a6933..13794c89a01 100644
--- a/docs/docs/reference/api.md
+++ b/docs/docs/reference/api.md
@@ -1671,7 +1671,7 @@ Status Code **200**
     "client_secret_expires_at": 0,
     "client_uri": "string",
     "contacts": ["string"],
-    "created_at": "2020-04-16T18:02:23Z",
+    "created_at": "2020-04-16T18:37:27Z",
     "frontchannel_logout_session_required": true,
     "frontchannel_logout_uri": "string",
     "grant_types": ["string"],
@@ -1691,7 +1691,7 @@ Status Code **200**
     "subject_type": "string",
     "token_endpoint_auth_method": "string",
     "tos_uri": "string",
-    "updated_at": "2020-04-16T18:02:23Z",
+    "updated_at": "2020-04-16T18:37:27Z",
     "userinfo_signed_response_alg": "string"
   }
 ]
@@ -1871,7 +1871,7 @@ and only callable by first-party components.
   "client_secret_expires_at": 0,
   "client_uri": "string",
   "contacts": ["string"],
-  "created_at": "2020-04-16T18:02:23Z",
+  "created_at": "2020-04-16T18:37:27Z",
   "frontchannel_logout_session_required": true,
   "frontchannel_logout_uri": "string",
   "grant_types": ["string"],
@@ -1891,7 +1891,7 @@ and only callable by first-party components.
   "subject_type": "string",
   "token_endpoint_auth_method": "string",
   "tos_uri": "string",
-  "updated_at": "2020-04-16T18:02:23Z",
+  "updated_at": "2020-04-16T18:37:27Z",
   "userinfo_signed_response_alg": "string"
 }
 ```
@@ -1933,7 +1933,7 @@ and only callable by first-party components.
   "client_secret_expires_at": 0,
   "client_uri": "string",
   "contacts": ["string"],
-  "created_at": "2020-04-16T18:02:23Z",
+  "created_at": "2020-04-16T18:37:27Z",
   "frontchannel_logout_session_required": true,
   "frontchannel_logout_uri": "string",
   "grant_types": ["string"],
@@ -1953,7 +1953,7 @@ and only callable by first-party components.
   "subject_type": "string",
   "token_endpoint_auth_method": "string",
   "tos_uri": "string",
-  "updated_at": "2020-04-16T18:02:23Z",
+  "updated_at": "2020-04-16T18:37:27Z",
   "userinfo_signed_response_alg": "string"
 }
 ```
@@ -2034,7 +2034,7 @@ const input = '{
   "contacts": [
     "string"
   ],
-  "created_at": "2020-04-16T18:02:23Z",
+  "created_at": "2020-04-16T18:37:27Z",
   "frontchannel_logout_session_required": true,
   "frontchannel_logout_uri": "string",
   "grant_types": [
@@ -2064,7 +2064,7 @@ const input = '{
   "subject_type": "string",
   "token_endpoint_auth_method": "string",
   "tos_uri": "string",
-  "updated_at": "2020-04-16T18:02:23Z",
+  "updated_at": "2020-04-16T18:37:27Z",
   "userinfo_signed_response_alg": "string"
 }';
 const headers = {
@@ -2203,7 +2203,7 @@ and only callable by first-party components.
   "client_secret_expires_at": 0,
   "client_uri": "string",
   "contacts": ["string"],
-  "created_at": "2020-04-16T18:02:23Z",
+  "created_at": "2020-04-16T18:37:27Z",
   "frontchannel_logout_session_required": true,
   "frontchannel_logout_uri": "string",
   "grant_types": ["string"],
@@ -2223,7 +2223,7 @@ and only callable by first-party components.
   "subject_type": "string",
   "token_endpoint_auth_method": "string",
   "tos_uri": "string",
-  "updated_at": "2020-04-16T18:02:23Z",
+  "updated_at": "2020-04-16T18:37:27Z",
   "userinfo_signed_response_alg": "string"
 }
 ```
@@ -2401,7 +2401,7 @@ and only callable by first-party components.
   "client_secret_expires_at": 0,
   "client_uri": "string",
   "contacts": ["string"],
-  "created_at": "2020-04-16T18:02:23Z",
+  "created_at": "2020-04-16T18:37:27Z",
   "frontchannel_logout_session_required": true,
   "frontchannel_logout_uri": "string",
   "grant_types": ["string"],
@@ -2421,7 +2421,7 @@ and only callable by first-party components.
   "subject_type": "string",
   "token_endpoint_auth_method": "string",
   "tos_uri": "string",
-  "updated_at": "2020-04-16T18:02:23Z",
+  "updated_at": "2020-04-16T18:37:27Z",
   "userinfo_signed_response_alg": "string"
 }
 ```
@@ -2462,7 +2462,7 @@ and only callable by first-party components.
   "client_secret_expires_at": 0,
   "client_uri": "string",
   "contacts": ["string"],
-  "created_at": "2020-04-16T18:02:23Z",
+  "created_at": "2020-04-16T18:37:27Z",
   "frontchannel_logout_session_required": true,
   "frontchannel_logout_uri": "string",
   "grant_types": ["string"],
@@ -2482,7 +2482,7 @@ and only callable by first-party components.
   "subject_type": "string",
   "token_endpoint_auth_method": "string",
   "tos_uri": "string",
-  "updated_at": "2020-04-16T18:02:23Z",
+  "updated_at": "2020-04-16T18:37:27Z",
   "userinfo_signed_response_alg": "string"
 }
 ```
@@ -2563,7 +2563,7 @@ const input = '{
   "contacts": [
     "string"
   ],
-  "created_at": "2020-04-16T18:02:23Z",
+  "created_at": "2020-04-16T18:37:27Z",
   "frontchannel_logout_session_required": true,
   "frontchannel_logout_uri": "string",
   "grant_types": [
@@ -2593,7 +2593,7 @@ const input = '{
   "subject_type": "string",
   "token_endpoint_auth_method": "string",
   "tos_uri": "string",
-  "updated_at": "2020-04-16T18:02:23Z",
+  "updated_at": "2020-04-16T18:37:27Z",
   "userinfo_signed_response_alg": "string"
 }';
 const headers = {
@@ -4814,7 +4814,7 @@ the subject accepted or rejected the request.
     "client_secret_expires_at": 0,
     "client_uri": "string",
     "contacts": ["string"],
-    "created_at": "2020-04-16T18:02:23Z",
+    "created_at": "2020-04-16T18:37:27Z",
     "frontchannel_logout_session_required": true,
     "frontchannel_logout_uri": "string",
     "grant_types": ["string"],
@@ -4834,7 +4834,7 @@ the subject accepted or rejected the request.
     "subject_type": "string",
     "token_endpoint_auth_method": "string",
     "tos_uri": "string",
-    "updated_at": "2020-04-16T18:02:23Z",
+    "updated_at": "2020-04-16T18:37:27Z",
     "userinfo_signed_response_alg": "string"
   },
   "context": {},
@@ -5039,7 +5039,7 @@ the user-agent to.
 {
   "grant_access_token_audience": ["string"],
   "grant_scope": ["string"],
-  "handled_at": "2020-04-16T18:02:23Z",
+  "handled_at": "2020-04-16T18:37:27Z",
   "remember": true,
   "remember_for": 0,
   "session": {
@@ -5152,7 +5152,7 @@ const input = '{
   "grant_scope": [
     "string"
   ],
-  "handled_at": "2020-04-16T18:02:23Z",
+  "handled_at": "2020-04-16T18:37:27Z",
   "remember": true,
   "remember_for": 0,
   "session": {
@@ -5539,7 +5539,7 @@ the requested authentication process.
     "client_secret_expires_at": 0,
     "client_uri": "string",
     "contacts": ["string"],
-    "created_at": "2020-04-16T18:02:23Z",
+    "created_at": "2020-04-16T18:37:27Z",
     "frontchannel_logout_session_required": true,
     "frontchannel_logout_uri": "string",
     "grant_types": ["string"],
@@ -5559,7 +5559,7 @@ the requested authentication process.
     "subject_type": "string",
     "token_endpoint_auth_method": "string",
     "tos_uri": "string",
-    "updated_at": "2020-04-16T18:02:23Z",
+    "updated_at": "2020-04-16T18:37:27Z",
     "userinfo_signed_response_alg": "string"
   },
   "oidc_context": {
@@ -6895,7 +6895,7 @@ Status Code **200**
         "client_secret_expires_at": 0,
         "client_uri": "string",
         "contacts": ["string"],
-        "created_at": "2020-04-16T18:02:23Z",
+        "created_at": "2020-04-16T18:37:27Z",
         "frontchannel_logout_session_required": true,
         "frontchannel_logout_uri": "string",
         "grant_types": ["string"],
@@ -6915,7 +6915,7 @@ Status Code **200**
         "subject_type": "string",
         "token_endpoint_auth_method": "string",
         "tos_uri": "string",
-        "updated_at": "2020-04-16T18:02:23Z",
+        "updated_at": "2020-04-16T18:37:27Z",
         "userinfo_signed_response_alg": "string"
       },
       "context": {},
@@ -6939,7 +6939,7 @@ Status Code **200**
     },
     "grant_access_token_audience": ["string"],
     "grant_scope": ["string"],
-    "handled_at": "2020-04-16T18:02:23Z",
+    "handled_at": "2020-04-16T18:37:27Z",
     "remember": true,
     "remember_for": 0,
     "session": {
@@ -7499,7 +7499,7 @@ deleted automatically when performing the refresh flow.
 
 ```json
 {
-  "notAfter": "2020-04-16T18:02:23Z"
+  "notAfter": "2020-04-16T18:37:27Z"
 }
 ```
 
@@ -7597,7 +7597,7 @@ func main() {
 ```nodejs
 const fetch = require('node-fetch');
 const input = '{
-  "notAfter": "2020-04-16T18:02:23Z"
+  "notAfter": "2020-04-16T18:37:27Z"
 }';
 const headers = {
   'Content-Type': 'application/json',  'Accept': 'application/json'
@@ -8220,7 +8220,7 @@ _None_
 <a id="schemanulltime"></a>
 
 ```json
-"2020-04-16T18:02:23Z"
+"2020-04-16T18:37:27Z"
 ```
 
 _NullTime implements sql.NullTime functionality._
@@ -8253,7 +8253,7 @@ _NullTime implements sql.NullTime functionality._
       "client_secret_expires_at": 0,
       "client_uri": "string",
       "contacts": ["string"],
-      "created_at": "2020-04-16T18:02:23Z",
+      "created_at": "2020-04-16T18:37:27Z",
       "frontchannel_logout_session_required": true,
       "frontchannel_logout_uri": "string",
       "grant_types": ["string"],
@@ -8273,7 +8273,7 @@ _NullTime implements sql.NullTime functionality._
       "subject_type": "string",
       "token_endpoint_auth_method": "string",
       "tos_uri": "string",
-      "updated_at": "2020-04-16T18:02:23Z",
+      "updated_at": "2020-04-16T18:37:27Z",
       "userinfo_signed_response_alg": "string"
     },
     "context": {},
@@ -8297,7 +8297,7 @@ _NullTime implements sql.NullTime functionality._
   },
   "grant_access_token_audience": ["string"],
   "grant_scope": ["string"],
-  "handled_at": "2020-04-16T18:02:23Z",
+  "handled_at": "2020-04-16T18:37:27Z",
   "remember": true,
   "remember_for": 0,
   "session": {
@@ -8356,7 +8356,7 @@ _StringSlicePipeDelimiter de/encodes the string slice to/from a SQL string._
 {
   "grant_access_token_audience": ["string"],
   "grant_scope": ["string"],
-  "handled_at": "2020-04-16T18:02:23Z",
+  "handled_at": "2020-04-16T18:37:27Z",
   "remember": true,
   "remember_for": 0,
   "session": {
@@ -8457,7 +8457,7 @@ request._
     "client_secret_expires_at": 0,
     "client_uri": "string",
     "contacts": ["string"],
-    "created_at": "2020-04-16T18:02:23Z",
+    "created_at": "2020-04-16T18:37:27Z",
     "frontchannel_logout_session_required": true,
     "frontchannel_logout_uri": "string",
     "grant_types": ["string"],
@@ -8477,7 +8477,7 @@ request._
     "subject_type": "string",
     "token_endpoint_auth_method": "string",
     "tos_uri": "string",
-    "updated_at": "2020-04-16T18:02:23Z",
+    "updated_at": "2020-04-16T18:37:27Z",
     "userinfo_signed_response_alg": "string"
   },
   "context": {},
@@ -8558,7 +8558,7 @@ _Used to pass session data to a consent request._
 
 ```json
 {
-  "notAfter": "2020-04-16T18:02:23Z"
+  "notAfter": "2020-04-16T18:37:27Z"
 }
 ```
 
@@ -8676,7 +8676,7 @@ _Error response_
     "client_secret_expires_at": 0,
     "client_uri": "string",
     "contacts": ["string"],
-    "created_at": "2020-04-16T18:02:23Z",
+    "created_at": "2020-04-16T18:37:27Z",
     "frontchannel_logout_session_required": true,
     "frontchannel_logout_uri": "string",
     "grant_types": ["string"],
@@ -8696,7 +8696,7 @@ _Error response_
     "subject_type": "string",
     "token_endpoint_auth_method": "string",
     "tos_uri": "string",
-    "updated_at": "2020-04-16T18:02:23Z",
+    "updated_at": "2020-04-16T18:37:27Z",
     "userinfo_signed_response_alg": "string"
   },
   "oidc_context": {
@@ -8778,7 +8778,7 @@ _Contains information about an ongoing logout request._
   "client_secret_expires_at": 0,
   "client_uri": "string",
   "contacts": ["string"],
-  "created_at": "2020-04-16T18:02:23Z",
+  "created_at": "2020-04-16T18:37:27Z",
   "frontchannel_logout_session_required": true,
   "frontchannel_logout_uri": "string",
   "grant_types": ["string"],
@@ -8798,7 +8798,7 @@ _Contains information about an ongoing logout request._
   "subject_type": "string",
   "token_endpoint_auth_method": "string",
   "tos_uri": "string",
-  "updated_at": "2020-04-16T18:02:23Z",
+  "updated_at": "2020-04-16T18:37:27Z",
   "userinfo_signed_response_alg": "string"
 }
 ```
diff --git a/docs/docs/reference/configuration.md b/docs/docs/reference/configuration.md
index c057cc50c7d..fb4e63bea24 100644
--- a/docs/docs/reference/configuration.md
+++ b/docs/docs/reference/configuration.md
@@ -44,7 +44,7 @@ log:
   # - Windows Command Line (CMD):
   #    > set LOG_LEVEL=<value>
   #
-  level: debug
+  level: trace
 
   ## format ##
   #
@@ -58,7 +58,7 @@ log:
   # - Windows Command Line (CMD):
   #    > set LOG_FORMAT=<value>
   #
-  format: text
+  format: json
 
 ## serve ##
 #
@@ -80,7 +80,7 @@ serve:
     # - Windows Command Line (CMD):
     #    > set SERVE_PUBLIC_PORT=<value>
     #
-    port: 15306
+    port: 37922
 
     ## host ##
     #
@@ -134,7 +134,9 @@ serve:
       #    > set SERVE_PUBLIC_CORS_ALLOWED_ORIGINS=<value>
       #
       allowed_origins:
-        - '*'
+        - https://example.com
+        - https://*.example.com
+        - https://*.foo.example.com
 
       ## allowed_methods ##
       #
@@ -149,7 +151,9 @@ serve:
       #    > set SERVE_PUBLIC_CORS_ALLOWED_METHODS=<value>
       #
       allowed_methods:
-        - PUT
+        - POST
+        - GET
+        - TRACE
 
       ## allowed_headers ##
       #
@@ -164,8 +168,10 @@ serve:
       #    > set SERVE_PUBLIC_CORS_ALLOWED_HEADERS=<value>
       #
       allowed_headers:
-        - ea aliquip proident occaecat eu
-        - proident
+        - sunt magna cillum dolore voluptate
+        - adipisicing esse exercitation
+        - commodo qui nulla in id
+        - nostrud exercitation aute dolor in
 
       ## exposed_headers ##
       #
@@ -180,7 +186,9 @@ serve:
       #    > set SERVE_PUBLIC_CORS_EXPOSED_HEADERS=<value>
       #
       exposed_headers:
-        - minim voluptate sit
+        - in quis voluptate culpa
+        - reprehenderit ex dolore
+        - eu ipsum officia ullamco
 
       ## allow_credentials ##
       #
@@ -194,7 +202,7 @@ serve:
       # - Windows Command Line (CMD):
       #    > set SERVE_PUBLIC_CORS_ALLOW_CREDENTIALS=<value>
       #
-      allow_credentials: false
+      allow_credentials: true
 
       ## max_age ##
       #
@@ -206,7 +214,7 @@ serve:
       # - Windows Command Line (CMD):
       #    > set SERVE_PUBLIC_CORS_MAX_AGE=<value>
       #
-      max_age: 39926407
+      max_age: 64210505
 
       ## debug ##
       #
@@ -220,7 +228,7 @@ serve:
       # - Windows Command Line (CMD):
       #    > set SERVE_PUBLIC_CORS_DEBUG=<value>
       #
-      debug: true
+      debug: false
 
   ## admin ##
   #
@@ -233,7 +241,7 @@ serve:
     # - Windows Command Line (CMD):
     #    > set SERVE_ADMIN_PORT=<value>
     #
-    port: 64246
+    port: 11452
 
     ## host ##
     #
@@ -278,8 +286,11 @@ serve:
       #    > set SERVE_ADMIN_CORS_ALLOWED_METHODS=<value>
       #
       allowed_methods:
+        - POST
+        - CONNECT
+        - DELETE
         - HEAD
-        - GET
+        - PATCH
 
       ## allowed_headers ##
       #
@@ -290,7 +301,8 @@ serve:
       #    > set SERVE_ADMIN_CORS_ALLOWED_HEADERS=<value>
       #
       allowed_headers:
-        - voluptate
+        - do pariatur fugiat ipsum quis
+        - laborum
 
       ## exposed_headers ##
       #
@@ -301,8 +313,7 @@ serve:
       #    > set SERVE_ADMIN_CORS_EXPOSED_HEADERS=<value>
       #
       exposed_headers:
-        - magna consectetur Lorem aliquip in
-        - sunt ea sint
+        - dolor ut id Ut
 
       ## allow_credentials ##
       #
@@ -312,7 +323,7 @@ serve:
       # - Windows Command Line (CMD):
       #    > set SERVE_ADMIN_CORS_ALLOW_CREDENTIALS=<value>
       #
-      allow_credentials: false
+      allow_credentials: true
 
       ## max_age ##
       #
@@ -322,7 +333,7 @@ serve:
       # - Windows Command Line (CMD):
       #    > set SERVE_ADMIN_CORS_MAX_AGE=<value>
       #
-      max_age: 23393730
+      max_age: 39479969
 
       ## debug ##
       #
@@ -359,15 +370,15 @@ serve:
     # Configures the private key (pem encoded).
     #
     cert:
-      ## base64 ##
+      ## path ##
       #
       # Set this value using environment variables on
       # - Linux/macOS:
-      #    $ export SERVE_TLS_CERT_BASE64=<value>
+      #    $ export SERVE_TLS_CERT_PATH=<value>
       # - Windows Command Line (CMD):
-      #    > set SERVE_TLS_CERT_BASE64=<value>
+      #    > set SERVE_TLS_CERT_PATH=<value>
       #
-      base64: 0RY1SAWsmLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tXG5NSUlEWlRDQ0FrMmdBd0lCQWdJRVY1eE90REFOQmdr...
+      path: /path/to/file.pem
 
     ## allow_termination_from ##
     #
@@ -384,7 +395,6 @@ serve:
       - 127.0.0.1/32
       - 127.0.0.1/32
       - 127.0.0.1/32
-      - 127.0.0.1/32
 
   ## cookies ##
   #
@@ -401,7 +411,7 @@ serve:
     # - Windows Command Line (CMD):
     #    > set SERVE_COOKIES_SAME_SITE_MODE=<value>
     #
-    same_site_mode: Lax
+    same_site_mode: Strict
 
 ## dsn ##
 #
@@ -413,7 +423,7 @@ serve:
 # - Windows Command Line (CMD):
 #    > set DSN=<value>
 #
-dsn: minim commodo ut adipisicing
+dsn: anim aliquip et enim
 
 ## webfinger ##
 #
@@ -758,7 +768,7 @@ ttl:
   # - Windows Command Line (CMD):
   #    > set TTL_REFRESH_TOKEN=<value>
   #
-  refresh_token: 1h
+  refresh_token: 720h
 
   ## id_token ##
   #
@@ -830,7 +840,7 @@ oauth2:
       # - Windows Command Line (CMD):
       #    > set OAUTH2_HASHERS_BCRYPT_COST=<value>
       #
-      cost: 37487127
+      cost: 37717394
 
   ## pkce ##
   #
diff --git a/go.mod b/go.mod
index c7c77c91204..ff500fdf542 100644
--- a/go.mod
+++ b/go.mod
@@ -32,7 +32,7 @@ require (
 	github.com/ory/go-acc v0.2.1
 	github.com/ory/graceful v0.1.1
 	github.com/ory/herodot v0.7.0
-	github.com/ory/sdk/swagutil v0.0.0-20200416162902-684156244f2c
+	github.com/ory/sdk/swagutil v0.0.0-20200416175937-89e79eede081
 	github.com/ory/viper v1.7.4
 	github.com/ory/x v0.0.111
 	github.com/pborman/uuid v1.2.0
diff --git a/go.sum b/go.sum
index 3614127320b..1900a57e7ba 100644
--- a/go.sum
+++ b/go.sum
@@ -863,6 +863,8 @@ github.com/ory/sdk/swagutil v0.0.0-20200407150153-53df6d772608 h1:FFvuEWPDFcJD3N
 github.com/ory/sdk/swagutil v0.0.0-20200407150153-53df6d772608/go.mod h1:Ufg1eAyz+Zt3+oweSZVThG13ewewWCKwBmoNmK8Z0co=
 github.com/ory/sdk/swagutil v0.0.0-20200416162902-684156244f2c h1:w9ABs54jbJxbh3m3PIKC5/ctZA1DZ629ACuHbY5/DgM=
 github.com/ory/sdk/swagutil v0.0.0-20200416162902-684156244f2c/go.mod h1:Ufg1eAyz+Zt3+oweSZVThG13ewewWCKwBmoNmK8Z0co=
+github.com/ory/sdk/swagutil v0.0.0-20200416175937-89e79eede081 h1:b6Ua5v35KuRHKrTus+pVsA4PJlWnsnIYerLFGr6Y4+E=
+github.com/ory/sdk/swagutil v0.0.0-20200416175937-89e79eede081/go.mod h1:Ufg1eAyz+Zt3+oweSZVThG13ewewWCKwBmoNmK8Z0co=
 github.com/ory/viper v1.5.6 h1:w4ceGgWwWLzAFYQ7bHaDZmwNsAto2JPVdyQjQnn7VWI=
 github.com/ory/viper v1.5.6/go.mod h1:TYmpFpKLxjQwvT4f0QPpkOn4sDXU1kDgAwJpgLYiQ28=
 github.com/ory/viper v1.7.4 h1:3RWBt7Pq9kSFNxLaRT0ljNdbtaWisCQG1cLPn2Yd4UY=