diff --git a/Resources/config/helper/collector.xml b/Resources/config/helper/collector.xml
index 1913d0a8..fa9f34af 100644
--- a/Resources/config/helper/collector.xml
+++ b/Resources/config/helper/collector.xml
@@ -42,6 +42,11 @@
             <argument type="service" id="ivory.google_map.helper.collector.overlay.icon" />
         </service>
 
+        <service
+            id="ivory.google_map.helper.collector.control.custom"
+            class="Ivory\GoogleMap\Helper\Collector\Control\CustomControlCollector"
+        />
+
         <service
             id="ivory.google_map.helper.collector.event.dom_event"
             class="Ivory\GoogleMap\Helper\Collector\Event\DomEventCollector"
diff --git a/Resources/config/helper/renderer.xml b/Resources/config/helper/renderer.xml
index e8d41676..74c44a0f 100644
--- a/Resources/config/helper/renderer.xml
+++ b/Resources/config/helper/renderer.xml
@@ -75,6 +75,23 @@
             parent="ivory.google_map.helper.renderer.abstract"
         />
 
+        <service
+            id="ivory.google_map.helper.renderer.control.custom"
+            class="Ivory\GoogleMap\Helper\Renderer\Control\CustomControlRenderer"
+            parent="ivory.google_map.helper.renderer.abstract"
+        >
+            <argument type="service" id="ivory.google_map.helper.renderer.control.position" />
+        </service>
+
+        <service
+            id="ivory.google_map.helper.renderer.control.fullscreen"
+            class="Ivory\GoogleMap\Helper\Renderer\Control\FullscreenControlRenderer"
+            parent="ivory.google_map.helper.renderer.json"
+        >
+            <argument type="service" id="ivory.google_map.helper.renderer.control.position" />
+            <tag name="ivory.google_map.helper.renderer.control" />
+        </service>
+
         <service
             id="ivory.google_map.helper.renderer.control.map_type"
             class="Ivory\GoogleMap\Helper\Renderer\Control\MapTypeControlRenderer"
diff --git a/Resources/config/helper/subscriber.xml b/Resources/config/helper/subscriber.xml
index bb10ec24..41e43e75 100644
--- a/Resources/config/helper/subscriber.xml
+++ b/Resources/config/helper/subscriber.xml
@@ -72,6 +72,24 @@
             <tag name="ivory.google_map.helper.subscriber" />
         </service>
 
+        <service
+            id="ivory.google_map.helper.subscriber.control"
+            class="Ivory\GoogleMap\Helper\Subscriber\Control\ControlSubscriber"
+            parent="ivory.google_map.helper.subscriber.abstract"
+        >
+            <tag name="ivory.google_map.helper.subscriber" />
+        </service>
+
+        <service
+            id="ivory.google_map.helper.subscriber.control.custom"
+            class="Ivory\GoogleMap\Helper\Subscriber\Control\CustomControlSubscriber"
+            parent="ivory.google_map.helper.subscriber.abstract"
+        >
+            <argument type="service" id="ivory.google_map.helper.collector.control.custom" />
+            <argument type="service" id="ivory.google_map.helper.renderer.control.custom" />
+            <tag name="ivory.google_map.helper.subscriber" />
+        </service>
+
         <service
             id="ivory.google_map.helper.subscriber.event"
             class="Ivory\GoogleMap\Helper\Subscriber\Event\EventSubscriber"
diff --git a/Tests/Helper/Control/CustomControlFunctionalTest.php b/Tests/Helper/Control/CustomControlFunctionalTest.php
new file mode 100644
index 00000000..f6fa5c13
--- /dev/null
+++ b/Tests/Helper/Control/CustomControlFunctionalTest.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Ivory Google Map package.
+ *
+ * (c) Eric GELOEN <geloen.eric@gmail.com>
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ivory\GoogleMapBundle\Tests\Helper\Control;
+
+use Ivory\GoogleMapBundle\Tests\Helper\HelperFactory;
+use Ivory\Tests\GoogleMap\Helper\Functional\Control\CustomControlFunctionalTest as BaseCustomControlFunctionalTest;
+
+/**
+ * @author GeLo <geloen.eric@gmail.com>
+ *
+ * @group functional
+ */
+class CustomControlFunctionalTest extends BaseCustomControlFunctionalTest
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function createApiHelper()
+    {
+        return HelperFactory::createApiHelper();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function createMapHelper()
+    {
+        return HelperFactory::createMapHelper();
+    }
+}
diff --git a/Tests/Helper/Control/FullscreenControlFunctionalTest.php b/Tests/Helper/Control/FullscreenControlFunctionalTest.php
new file mode 100644
index 00000000..ac05be30
--- /dev/null
+++ b/Tests/Helper/Control/FullscreenControlFunctionalTest.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Ivory Google Map package.
+ *
+ * (c) Eric GELOEN <geloen.eric@gmail.com>
+ *
+ * For the full copyright and license information, please read the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Ivory\GoogleMapBundle\Tests\Helper\Control;
+
+use Ivory\GoogleMapBundle\Tests\Helper\HelperFactory;
+use Ivory\Tests\GoogleMap\Helper\Functional\Control\FullscreenControlFunctionalTest as BaseFullscreenControlFunctionalTest;
+
+/**
+ * @author GeLo <geloen.eric@gmail.com>
+ *
+ * @group functional
+ */
+class FullscreenControlFunctionalTest extends BaseFullscreenControlFunctionalTest
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function createApiHelper()
+    {
+        return HelperFactory::createApiHelper();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function createMapHelper()
+    {
+        return HelperFactory::createMapHelper();
+    }
+}