diff --git a/CHANGELOG.md b/CHANGELOG.md
index a222c92..3706fb2 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# v1.6.0, 2019-09-15
+* Updates for Flextype 0.9.4
+
 # v1.5.0, 2019-07-08
 * Updates for Flextype 0.9.3
 * Fixed issue with response headers
diff --git a/LICENSE.txt b/LICENSE.txt
index 36ddbe3..1a2b199 100755
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 Flextype
+Copyright (c) 2018-2019 Sergey Romanenko
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index cefc21b..e2bf061 100755
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Sitemap Plugin for [Flextype](http://flextype.org/)
-![version](https://img.shields.io/badge/version-1.5.0-brightgreen.svg?style=flat-square "Version")
-![Flextype](https://img.shields.io/badge/Flextype-0.9.3-green.svg?style=flat-square "Flextype Version")
+![version](https://img.shields.io/badge/version-1.6.0-brightgreen.svg?style=flat-square "Version")
+![Flextype](https://img.shields.io/badge/Flextype-0.9.4-green.svg?style=flat-square "Flextype Version")
 [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://github.com/flextype-plugins/tiny-url/blob/master/LICENSE.txt)
 
 Sitemap plugin provide automatically generated XML sitemap for Flextype.
@@ -11,11 +11,9 @@ Unzip plugin to the folder `/site/plugins/`
 ## Settings
 enabled: true or false to disable the plugin
 
-```json
-{
-    "enabled": true
-}
+```yaml
+enabled: true
 ```
 
-## License
-See [LICENSE](https://github.com/flextype-plugins/sitemap/blob/master/LICENSE)
+## LICENSE
+[The MIT License (MIT)](https://github.com/flextype-plugins/sitemap/blob/master/LICENSE) Copyright (c) 2018-2019 [Sergey Romanenko](https://github.com/Awilum)
diff --git a/app/Controllers/SitemapController.php b/app/Controllers/SitemapController.php
index 9b6b3a4..152f548 100644
--- a/app/Controllers/SitemapController.php
+++ b/app/Controllers/SitemapController.php
@@ -11,7 +11,6 @@
  */
 class SitemapController extends Controller {
 
-
     /**
      * Index page
      *
@@ -21,7 +20,7 @@ class SitemapController extends Controller {
      */
     public function index(Request $request, Response $response) : Response
     {
-        $_entries = $this->entries->fetchAll('', ['recursive' => true, 'order_by' => ['field' => 'date', 'direction' => 'desc']]);
+        $_entries = $this->entries->fetchAll('', ['recursive' => true, 'order_by' => ['field' => 'published_at', 'direction' => 'desc']]);
         $entries  = [];
 
         foreach ($_entries as $entry) {
diff --git a/lang/en_US.json b/lang/en_US.json
deleted file mode 100755
index 4059c91..0000000
--- a/lang/en_US.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "sitemap": "Sitemap",
-  "sitemap_description": "Sitemap plugin provide automatically generated XML sitemap for Flextype."
-}
diff --git a/lang/en_US.yaml b/lang/en_US.yaml
new file mode 100755
index 0000000..7af0d0d
--- /dev/null
+++ b/lang/en_US.yaml
@@ -0,0 +1,2 @@
+sitemap: "Sitemap"
+sitemap_description: "Sitemap plugin provide automatically generated XML sitemap for Flextype."
diff --git a/lang/ru_RU.json b/lang/ru_RU.json
deleted file mode 100755
index 4059c91..0000000
--- a/lang/ru_RU.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "sitemap": "Sitemap",
-  "sitemap_description": "Sitemap plugin provide automatically generated XML sitemap for Flextype."
-}
diff --git a/lang/ru_RU.yaml b/lang/ru_RU.yaml
new file mode 100755
index 0000000..7af0d0d
--- /dev/null
+++ b/lang/ru_RU.yaml
@@ -0,0 +1,2 @@
+sitemap: "Sitemap"
+sitemap_description: "Sitemap plugin provide automatically generated XML sitemap for Flextype."
diff --git a/plugin.json b/plugin.json
deleted file mode 100755
index f0e4dd8..0000000
--- a/plugin.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "Sitemap",
-  "version": "1.5.0",
-  "description": "Provide automatically generated XML sitemap.",
-  "author": {
-    "name": "Sergey Romanenko",
-    "email": "awilum@yandex.ru",
-    "url": "http://flextype.org"
-  },
-  "homepage": "https://github.com/flextype-plugins/sitemap",
-  "bugs": "https://github.com/flextype-plugins/sitemap/issues",
-  "license": "MIT"
-}
diff --git a/plugin.yaml b/plugin.yaml
new file mode 100755
index 0000000..8928633
--- /dev/null
+++ b/plugin.yaml
@@ -0,0 +1,10 @@
+name: Sitemap
+version: 1.6.0
+description: Provide automatically generated XML sitemap.
+author:
+  name: Sergey Romanenko
+  email: awilum@yandex.ru
+  url: http://flextype.org
+homepage: https://github.com/flextype-plugins/sitemap
+bugs: https://github.com/flextype-plugins/sitemap/issues
+license: MIT
diff --git a/settings.json b/settings.json
deleted file mode 100755
index 4e609c7..0000000
--- a/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "enabled": true
-}
diff --git a/settings.yaml b/settings.yaml
new file mode 100755
index 0000000..d4ca941
--- /dev/null
+++ b/settings.yaml
@@ -0,0 +1 @@
+enabled: true