diff --git a/app/controllers/item.php b/app/controllers/item.php
index ce02061..00f300b 100644
--- a/app/controllers/item.php
+++ b/app/controllers/item.php
@@ -132,7 +132,7 @@ Router\post_action('download-item', function () {
     $item = Model\Item\get($id);
     $feed = Model\Feed\get($item['feed_id']);
 
-    $download = Model\Item\download_content_id($id);
+    $download = Model\Item\download_contents($id);
     $download['content'] = Model\Proxy\rewrite_html($download['content'], $item['url'], Model\Config\get('image_proxy'), $feed['cloak_referrer']);
 
     Response\json($download);
diff --git a/app/handlers/scraper.php b/app/handlers/scraper.php
new file mode 100644
index 0000000..abdeed4
--- /dev/null
+++ b/app/handlers/scraper.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Handler\Scraper;
+
+use PicoFeed\Scraper\Scraper;
+use Model\Config;
+
+function download_contents($url)
+{
+    $contents = '';
+
+    $scraper = new Scraper(Config\get_reader_config());
+    $scraper->setUrl($url);
+    $scraper->execute();
+
+    if ($scraper->hasRelevantContent()) {
+        $contents = $scraper->getFilteredContent();
+    }
+
+    return $contents;
+}
diff --git a/app/models/item.php b/app/models/item.php
index 0759fcf..f7ff870 100644
--- a/app/models/item.php
+++ b/app/models/item.php
@@ -2,12 +2,12 @@
 
 namespace Model\Item;
 
+use PicoDb\Database;
+use PicoFeed\Logging\Logger;
 use Model\Service;
 use Model\Config;
 use Model\Group;
-use PicoDb\Database;
-use PicoFeed\Logging\Logger;
-use PicoFeed\Scraper\Scraper;
+use Handler;
 
 // Get all items without filtering
 function get_all()
@@ -407,32 +407,14 @@ function cleanup($feed_id, array $items_in_feed)
     }
 }
 
-// Download content from an URL
-function download_content_url($url)
-{
-    $content = '';
-
-    $grabber = new Scraper(Config\get_reader_config());
-    $grabber->setUrl($url);
-    $grabber->execute();
-
-    if ($grabber->hasRelevantContent()) {
-        $content = $grabber->getFilteredContent();
-    }
-
-    return $content;
-}
-
-// Download content from item ID
-function download_content_id($item_id)
+// Download item content
+function download_contents($item_id)
 {
     $item = get($item_id);
-    $content = download_content_url($item['url']);
+    $content = Handler\Scraper\download_contents($item['url']);
 
     if (! empty($content)) {
         if (! Config\get('nocontent')) {
-
-            // Save content
             Database::getInstance('db')
                 ->table('items')
                 ->eq('id', $item['id'])
diff --git a/composer.json b/composer.json
index 24e78f8..c99cc9d 100644
--- a/composer.json
+++ b/composer.json
@@ -38,6 +38,7 @@
             "app/core/router.php",
             "app/core/session.php",
             "app/core/template.php",
+            "app/handlers/scraper.php",
             "app/models/config.php",
             "app/models/service.php",
             "app/models/search.php",
diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
index 836ebb8..e7a7918 100644
--- a/vendor/composer/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -19,6 +19,7 @@ return array(
     'dbd9090b0db725af4a3cd765a9d2e39a' => $baseDir . '/app/core/router.php',
     '98faa6699f100c5ddb2013d85f9dfabb' => $baseDir . '/app/core/session.php',
     '93228d441890e5962b0566344884332c' => $baseDir . '/app/core/template.php',
+    '9de087554be89ca71a2ed558a4e35fde' => $baseDir . '/app/handlers/scraper.php',
     'bc98222aedc910930f5b76b8c84f334e' => $baseDir . '/app/models/config.php',
     'c3080c7edf4a590ce36fc4f3561968dc' => $baseDir . '/app/models/service.php',
     'b59348c9973f21f2c58eb493d9fea5be' => $baseDir . '/app/models/search.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 07d6b0f..7eea9c8 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -20,6 +20,7 @@ class ComposerStaticInitfd7e8d436e1dc450edc3153ac8bc31b4
         'dbd9090b0db725af4a3cd765a9d2e39a' => __DIR__ . '/../..' . '/app/core/router.php',
         '98faa6699f100c5ddb2013d85f9dfabb' => __DIR__ . '/../..' . '/app/core/session.php',
         '93228d441890e5962b0566344884332c' => __DIR__ . '/../..' . '/app/core/template.php',
+        '9de087554be89ca71a2ed558a4e35fde' => __DIR__ . '/../..' . '/app/handlers/scraper.php',
         'bc98222aedc910930f5b76b8c84f334e' => __DIR__ . '/../..' . '/app/models/config.php',
         'c3080c7edf4a590ce36fc4f3561968dc' => __DIR__ . '/../..' . '/app/models/service.php',
         'b59348c9973f21f2c58eb493d9fea5be' => __DIR__ . '/../..' . '/app/models/search.php',