diff --git a/README.md b/README.md
index 9944c95..0456c76 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Optional features:
 1. Require plugin with composer:
 
     ```bash
-    composer require stefandoorn/sylius-street-number-plugin:^1.0@alpha
+    composer require stefandoorn/sylius-street-number-plugin:^1.0@beta
     ```
 
 2. Add plugin class to your `AppKernel`.
@@ -31,14 +31,8 @@ Optional features:
     ```yaml
     - { resource: "@SyliusStreetNumberPlugin/Resources/config/config.yml" }
     ```
-    
-4. (optional) Load address resource override (if you don't have this done in your project yet):
-
-    ```yaml
-    - { resource: "@SyliusStreetNumberPlugin/Resources/config/resources.yml" }
-    ```
 
-5. Add doctrine mapping fields for table `sylius_address` (`config/doctrine/Address.orm.yml`):
+4. Add doctrine mapping fields for table `sylius_address` (see `tests/Application/config/doctrine/Address.orm.yml`):
 
     ```yaml
         ...
@@ -55,11 +49,21 @@ Optional features:
                 type: string
                 nullable: true                 
     ```
-    
-    In case you haven't already extended the Address class, Symfony will use the one from this bundle.
-    
+
     The `streetNumberAddition` field is always added, regardless whether you use it. It will be `null` in that cae.
 
+5. Add to `_sylius.yaml`:
+
+   ```yaml
+      ...
+   
+      sylius_addressing:
+         resources:
+            address:
+               classes:
+                model: App\Entity\Addressing\Address
+   ```
+
 6. Add to `SyliusAdminBundle/views/Common/Form/_address.html.twig`:
 
     ```twig
diff --git a/src/Entity/Address.php b/src/Entity/Address.php
deleted file mode 100644
index 38dbe90..0000000
--- a/src/Entity/Address.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace StefanDoorn\SyliusStreetNumberPlugin\Entity;
-
-use StefanDoorn\SyliusStreetNumberPlugin\Entity\Interfaces\AddressInterface;
-use StefanDoorn\SyliusStreetNumberPlugin\Entity\Traits\StreetNumberAddition;
-use Sylius\Component\Core\Model\Address as BaseAddress;
-
-class Address extends BaseAddress implements AddressInterface
-{
-    use StreetNumberAddition;
-}
diff --git a/src/Entity/Interfaces/AddressInterface.php b/src/Entity/Interfaces/AddressInterface.php
deleted file mode 100644
index ae5301d..0000000
--- a/src/Entity/Interfaces/AddressInterface.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace StefanDoorn\SyliusStreetNumberPlugin\Entity\Interfaces;
-
-use Sylius\Component\Core\Model\AddressInterface as BaseAddressInterface;
-
-interface AddressInterface extends BaseAddressInterface, StreetNumberAwareInterface
-{
-}
diff --git a/src/Resources/config/doctrine/Address.orm.yml b/src/Resources/config/doctrine/Address.orm.yml
deleted file mode 100644
index e10468e..0000000
--- a/src/Resources/config/doctrine/Address.orm.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-StefanDoorn\SyliusStreetNumberPlugin\Entity\Address:
-    type: entity
-    table: sylius_address
-    fields:
-        number:
-            column: street_number
-            type: string
-            nullable: false
-            options:
-                default: ''
-        addition:
-            column: street_number_addition
-            type: string
-            nullable: true
diff --git a/src/Resources/config/resources.yml b/src/Resources/config/resources.yml
deleted file mode 100644
index d442cab..0000000
--- a/src/Resources/config/resources.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-sylius_addressing:
-    resources:
-        address:
-            classes:
-                model: StefanDoorn\SyliusStreetNumberPlugin\Entity\Address
diff --git a/tests/Application/config/doctrine/Address.orm.yml b/tests/Application/config/doctrine/Address.orm.yml
new file mode 100644
index 0000000..27b876c
--- /dev/null
+++ b/tests/Application/config/doctrine/Address.orm.yml
@@ -0,0 +1,14 @@
+App\Entity\Addressing\Address:
+  type: entity
+  table: sylius_address
+  fields:
+    number:
+      column: street_number
+      type: string
+      nullable: false
+      options:
+        default: ''
+    addition:
+      column: street_number_addition
+      type: string
+      nullable: true
diff --git a/tests/Application/config/packages/_sylius.yaml b/tests/Application/config/packages/_sylius.yaml
index b98353a..a0e7b2d 100644
--- a/tests/Application/config/packages/_sylius.yaml
+++ b/tests/Application/config/packages/_sylius.yaml
@@ -19,3 +19,9 @@ sylius_shop:
 sylius_street_number:
     features:
         street_number_addition: true
+
+sylius_addressing:
+    resources:
+        address:
+            classes:
+                model: App\Entity\Addressing\Address
diff --git a/tests/Application/config/packages/doctrine.yaml b/tests/Application/config/packages/doctrine.yaml
index f51ba5a..64ba9f6 100644
--- a/tests/Application/config/packages/doctrine.yaml
+++ b/tests/Application/config/packages/doctrine.yaml
@@ -12,3 +12,10 @@ doctrine:
         charset: UTF8
 
         url: '%env(resolve:DATABASE_URL)%'
+
+    orm:
+        mappings:
+            is_bundle: false
+            type: yml
+            dir: "%kernel.project_dir%/config/doctrine"
+            prefix: App\Entity
diff --git a/tests/Application/src/Entity/Addressing/Address.php b/tests/Application/src/Entity/Addressing/Address.php
new file mode 100644
index 0000000..bd29892
--- /dev/null
+++ b/tests/Application/src/Entity/Addressing/Address.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity\Addressing;
+
+use Doctrine\ORM\Mapping as ORM;
+use StefanDoorn\SyliusStreetNumberPlugin\Entity\Interfaces\StreetNumberAwareInterface;
+use StefanDoorn\SyliusStreetNumberPlugin\Entity\Traits\StreetNumberAddition;
+use Sylius\Component\Core\Model\Address as BaseAddress;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table(name="sylius_address")
+ */
+class Address extends BaseAddress implements StreetNumberAwareInterface
+{
+    use StreetNumberAddition;
+}