diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php
index 1a5e12de..5acf91bd 100644
--- a/.phpstorm.meta.php
+++ b/.phpstorm.meta.php
@@ -1,7 +1,7 @@
 <?php
 namespace PHPSTORM_META;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 
 /**
  * PhpStorm Container Interop code completion
diff --git a/docs/swagger/paths/v1_authenticate.json b/docs/swagger/paths/v1_authenticate.json
index 843081bb..5816e0a4 100644
--- a/docs/swagger/paths/v1_authenticate.json
+++ b/docs/swagger/paths/v1_authenticate.json
@@ -25,6 +25,11 @@
                             "description": "The authentication token that needs to be sent in the Authorization header"
                         }
                     }
+                },
+                "examples": {
+                    "application/json": {
+                        "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWV9.TJVA95OrM7E2cBab30RMHrHDcEfxjoYZgeFONFh7HgQ"
+                    }
                 }
             },
             "400": {
diff --git a/docs/swagger/paths/v1_short-codes.json b/docs/swagger/paths/v1_short-codes.json
index 14834851..0f0778e8 100644
--- a/docs/swagger/paths/v1_short-codes.json
+++ b/docs/swagger/paths/v1_short-codes.json
@@ -68,6 +68,28 @@
                             }
                         }
                     }
+                },
+                "examples": {
+                    "application/json": {
+                        "shortUrls": {
+                            "data": [
+                                {
+                                    "shortCode": "",
+                                    "originalUrl": "https://store.steampowered.com",
+                                    "dateCreated": "2016-08-21T20:34:16+02:00",
+                                    "visitsCount": 328,
+                                    "tags": [
+                                        "games",
+                                        "tech"
+                                    ]
+                                }
+                            ],
+                            "pagination": {
+                                "currentPage": 5,
+                                "pagesCount": 12
+                            }
+                        }
+                    }
                 }
             },
             "500": {
diff --git a/module/CLI/src/Command/Api/ListKeysCommand.php b/module/CLI/src/Command/Api/ListKeysCommand.php
index 5e93adeb..b08c1ece 100644
--- a/module/CLI/src/Command/Api/ListKeysCommand.php
+++ b/module/CLI/src/Command/Api/ListKeysCommand.php
@@ -84,7 +84,7 @@ class ListKeysCommand extends Command
                 $rowData[] = $this->{$formatMethod}($this->getEnabledSymbol($row));
             }
 
-            $rowData[] = isset($expiration) ? $expiration->format(\DateTime::ISO8601) : '-';
+            $rowData[] = isset($expiration) ? $expiration->format(\DateTime::ATOM) : '-';
             $table->addRow($rowData);
         }
 
diff --git a/module/Core/src/Entity/ShortUrl.php b/module/Core/src/Entity/ShortUrl.php
index cf1ed87e..44e992ce 100644
--- a/module/Core/src/Entity/ShortUrl.php
+++ b/module/Core/src/Entity/ShortUrl.php
@@ -176,7 +176,7 @@ class ShortUrl extends AbstractEntity implements \JsonSerializable
         return [
             'shortCode' => $this->shortCode,
             'originalUrl' => $this->originalUrl,
-            'dateCreated' => isset($this->dateCreated) ? $this->dateCreated->format(\DateTime::ISO8601) : null,
+            'dateCreated' => isset($this->dateCreated) ? $this->dateCreated->format(\DateTime::ATOM) : null,
             'visitsCount' => count($this->visits),
             'tags' => $this->tags->toArray(),
         ];
diff --git a/module/Core/src/Entity/Visit.php b/module/Core/src/Entity/Visit.php
index a95c61b0..c1ab7333 100644
--- a/module/Core/src/Entity/Visit.php
+++ b/module/Core/src/Entity/Visit.php
@@ -171,7 +171,7 @@ class Visit extends AbstractEntity implements \JsonSerializable
     {
         return [
             'referer' => $this->referer,
-            'date' => isset($this->date) ? $this->date->format(\DateTime::ISO8601) : null,
+            'date' => isset($this->date) ? $this->date->format(\DateTime::ATOM) : null,
             'remoteAddr' => $this->remoteAddr,
             'userAgent' => $this->userAgent,
             'visitLocation' => $this->visitLocation,