diff --git a/bundle/SiteMapBundle/SiteMapGenerator.php b/bundle/SiteMapBundle/SiteMapGenerator.php
index d307f84..950b428 100644
--- a/bundle/SiteMapBundle/SiteMapGenerator.php
+++ b/bundle/SiteMapBundle/SiteMapGenerator.php
@@ -5,17 +5,21 @@ namespace Homepage\SiteMapBundle;
 use Sculpin\Core\DataProvider\DataProviderInterface;
 use Sculpin\Core\Event\SourceSetEvent;
 use Sculpin\Core\Sculpin;
+use Sculpin\Core\Source\SourceInterface;
 use Sculpin\Core\Source\SourceSet;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 class SiteMapGenerator implements DataProviderInterface, EventSubscriberInterface
 {
-    protected $siteMap;
+    /**
+     * @var array|null
+     */
+    private $siteMap;
 
     /**
      * @var SourceSet
      */
-    protected $sources;
+    private $sources;
 
     /**
      * {@inheritdoc}
@@ -27,63 +31,6 @@ class SiteMapGenerator implements DataProviderInterface, EventSubscriberInterfac
         ];
     }
 
-    /**
-     * Before run.
-     *
-     * @param SourceSetEvent $sourceSetEvent Source Set Event
-     */
-    public function saveSourceSet(SourceSetEvent $sourceSetEvent)
-    {
-        $this->sources = $sourceSetEvent->sourceSet();
-    }
-
-    protected function buildSiteMap()
-    {
-        if (!empty($this->siteMap)) {
-            return $this->siteMap;
-        }
-
-        $siteMap = [];
-
-        /** @var \Sculpin\Core\Source\FileSource $source */
-        foreach ($this->sources->allSources() as $source) {
-            $data = $source->data()->export();
-
-            if (empty($data) || $source->useFileReference()) {
-                continue;
-            }
-
-            $siteMapData = $data['sitemap'] ?? [];
-
-            if (isset($siteMapData['_exclude'])) {
-                continue;
-            }
-
-            $loc = $data['canonical'] ?? $data['url'];
-
-            if (is_callable([$source, 'file'])) {
-                $lastmod = date(DATE_W3C, $source->file()->getMTime());
-            } else {
-                $lastmod = date(DATE_W3C);
-            }
-
-            $url = [
-                'loc' => $loc,
-                'lastmod' => $lastmod,
-            ];
-
-            if (isset($data['sitemap'])) {
-                $url = array_merge($url, $data['sitemap']);
-            }
-
-            $siteMap[$url['loc']] = $url;
-        }
-
-        $this->siteMap = $siteMap;
-
-        return $this->siteMap;
-    }
-
     /**
      * Provide data.
      *
@@ -95,4 +42,79 @@ class SiteMapGenerator implements DataProviderInterface, EventSubscriberInterfac
 
         return $this->siteMap;
     }
+
+    /**
+     * Before run.
+     *
+     * @param SourceSetEvent $sourceSetEvent Source Set Event
+     */
+    public function saveSourceSet(SourceSetEvent $sourceSetEvent)
+    {
+        $this->sources = $sourceSetEvent->sourceSet();
+    }
+
+    protected function buildSiteMap(): array
+    {
+        if ($this->siteMap !== null) {
+            return $this->siteMap;
+        }
+
+        $this->siteMap = $this->createSiteMap();
+
+        return $this->siteMap;
+    }
+
+    private function createSiteMap(): array
+    {
+        $siteMap = [];
+
+        /** @var \Sculpin\Core\Source\FileSource $source */
+        foreach ($this->sources->allSources() as $source) {
+            $url = $this->createSiteUrlFromSource($source);
+            if (!$url) {
+                continue;
+            }
+            $siteMap[$url['loc']] = $url;
+        }
+
+        return $siteMap;
+    }
+
+    private function createSiteUrlFromSource(SourceInterface $source): array
+    {
+        $data = $source->data()->export();
+
+        if (empty($data) || $source->useFileReference()) {
+            return [];
+        }
+
+        if ($data['draft']) {
+            return [];
+        }
+
+        $siteMapData = $data['sitemap'] ?? [];
+
+        if (array_key_exists('_exclude', $siteMapData)) {
+            return [];
+        }
+
+        $loc = $data['canonical'] ?? $data['url'];
+
+        if (is_callable([$source, 'file'])) {
+            $lastmod = date(DATE_W3C, $source->file()->getMTime());
+        } else {
+            $lastmod = date(DATE_W3C);
+        }
+
+        $url = [
+            'loc' => $loc,
+            'lastmod' => $lastmod,
+        ];
+
+        if (isset($data['sitemap'])) {
+            $url = array_merge($url, $data['sitemap']);
+        }
+
+        return $url;
+    }
 }