diff --git a/composer.json b/composer.json
index 6e5ed01..7d489ae 100644
--- a/composer.json
+++ b/composer.json
@@ -1,44 +1,70 @@
 {
-  "name":"netzmacht/contao-leaflet-geocode-widget",
-  "description":"Geocode widget based on Leaflet",
-  "keywords":["geocode", "contao", "widget", "leaflet"],
-  "type":"contao-bundle",
-  "license":"LGPL-3.0+",
-  "authors":[
-    {
-      "name":"David Molineus",
-      "email":"mail@netzmacht.de",
-      "homepage":"http://www.netzmacht.de",
-      "role":"Project leader"
+    "name": "netzmacht/contao-leaflet-geocode-widget",
+    "description": "Geocode widget based on Leaflet",
+    "keywords": [
+        "geocode",
+        "contao",
+        "widget",
+        "leaflet"
+    ],
+    "type": "contao-bundle",
+    "license": "LGPL-3.0+",
+    "authors": [
+        {
+            "name": "David Molineus",
+            "email": "mail@netzmacht.de",
+            "homepage": "http://www.netzmacht.de",
+            "role": "Project leader"
+        }
+    ],
+    "support": {
+        "email": "mail@netzmacht.de",
+        "issues": "https://github.com/contao-bootstrap/core/issues",
+        "wiki": "http://contao-bootstrap.netzmacht.de",
+        "source": "https://github.com/contao-bootstrap/core"
+    },
+    "require": {
+        "php": ">=5.5.0",
+        "contao/core-bundle": "~4.3",
+        "contao-community-alliance/composer-plugin": "~2.4 || ~3.0",
+        "netzmacht/contao-leaflet-libraries": "~1.0",
+        "contao-community-alliance/composer-client": "~0.14"
+    },
+    "require-dev": {
+        "netzmacht/contao-build-tools": "~1.1",
+        "contao/manager-plugin": "^2.0"
+    },
+    "conflict": {
+        "contao/manager-plugin": "<2.0 || >=3.0"
+    },
+    "suggest": {
+        "netzmacht/contao-leaflet-maps": "Leaflet Maps for Contao"
+    },
+    "autoload": {
+        "psr-4": {
+            "Netzmacht\\Contao\\Leaflet\\GeocodeWidget\\": "src/"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev",
+            "dev-develop": "1.1.x-dev"
+        },
+        "contao-manager-plugin": "Netzmacht\\Contao\\Leaflet\\GeocodeWidget\\ContaoManager\\Plugin"
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://legacy-packages-via.contao-community-alliance.org/"
+        },
+        {
+            "type": "artifact",
+            "url": "packages"
+        }
+    ],
+    "config": {
+        "component-dir": "../assets/components"
     }
-  ],
-  "support":{
-    "email":"mail@netzmacht.de",
-    "issues":"https://github.com/contao-bootstrap/core/issues",
-    "wiki":"http://contao-bootstrap.netzmacht.de",
-    "source":"https://github.com/contao-bootstrap/core"
-  },
-  "require":{
-    "php":">=5.5.0",
-    "contao/core-bundle":"~4.3",
-    "contao-community-alliance/composer-plugin": "~2.4 | ~3.0",
-    "netzmacht/contao-leaflet-libraries":"~1.0"
-  },
-  "require-dev": {
-    "netzmacht/contao-build-tools": "~1.1"
-  },
-  "suggest": {
-    "netzmacht/contao-leaflet-maps": "Leaflet Maps for Contao"
-  },
-  "autoload": {
-    "psr-4": { "Netzmacht\\Contao\\Leaflet\\GeocodeWidget\\": "src/" }
-  },
-  "extra":{
-    "branch-alias": {
-      "dev-master": "1.0.x-dev",
-      "dev-develop": "1.1.x-dev"
-    }
-  },
-  "minimum-stability": "dev",
-  "prefer-stable": true
 }
diff --git a/src/ContaoManager/Plugin.php b/src/ContaoManager/Plugin.php
new file mode 100644
index 0000000..ce8132e
--- /dev/null
+++ b/src/ContaoManager/Plugin.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * @package    netzmacht
+ * @author     David Molineus <david.molineus@netzmacht.de>
+ * @copyright  2017 netzmacht David Molineus. All rights reserved.
+ * @filesource
+ *
+ */
+
+namespace Netzmacht\Contao\Leaflet\GeocodeWidget\ContaoManager;
+
+use Contao\CoreBundle\ContaoCoreBundle;
+use Contao\ManagerPlugin\Bundle\BundlePluginInterface;
+use Contao\ManagerPlugin\Bundle\Config\BundleConfig;
+use Contao\ManagerPlugin\Bundle\Parser\ParserInterface;
+use Netzmacht\Contao\Leaflet\GeocodeWidget\LeafletGeocodeWidgetBundle;
+
+/**
+ * Class Plugin
+ *
+ * @package Netzmacht\Contao\Leaflet\GeocodeWidget\ContaoManager
+ */
+class Plugin implements BundlePluginInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getBundles(ParserInterface $parser)
+    {
+        return [
+            BundleConfig::create(LeafletGeocodeWidgetBundle::class)
+                ->setLoadAfter([ContaoCoreBundle::class]),
+        ];
+    }
+}