diff --git a/composer.json b/composer.json
index 915a430..04cfa73 100644
--- a/composer.json
+++ b/composer.json
@@ -21,9 +21,9 @@
         "ext-json": "*",
         "guzzlehttp/guzzle": "^6.0",
         "psr/log": "^1.0",
-        "webeweb/core-library": "^7.0",
         "webeweb/provider-library": "^1.0",
-        "webeweb/traits-library": "^1.0"
+        "webeweb/traits-library": "^1.0",
+        "webeweb/types-library": "^1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^7.0|^9.0"
diff --git a/src/Provider/APIv1Provider.php b/src/Provider/APIv1Provider.php
index 143f487..c79d142 100644
--- a/src/Provider/APIv1Provider.php
+++ b/src/Provider/APIv1Provider.php
@@ -13,7 +13,6 @@
 
 use GuzzleHttp\Exception\GuzzleException;
 use InvalidArgumentException;
-use WBW\Library\Core\Exception\ApiException;
 use WBW\Library\Pappers\Request\DocumentTelechargementRequest;
 use WBW\Library\Pappers\Request\EntrepriseRequest;
 use WBW\Library\Pappers\Request\RechercheRequest;
@@ -22,6 +21,7 @@
 use WBW\Library\Pappers\Response\RechercheResponse;
 use WBW\Library\Pappers\Serializer\RequestSerializer;
 use WBW\Library\Pappers\Serializer\ResponseDeserializer;
+use WBW\Library\Provider\Exception\ApiException;
 
 /**
  * API v1 provider.
diff --git a/src/Provider/APIv2Provider.php b/src/Provider/APIv2Provider.php
index 68f2e97..97098ac 100644
--- a/src/Provider/APIv2Provider.php
+++ b/src/Provider/APIv2Provider.php
@@ -13,7 +13,6 @@
 
 use GuzzleHttp\Exception\GuzzleException;
 use InvalidArgumentException;
-use WBW\Library\Core\Exception\ApiException;
 use WBW\Library\Pappers\Request\DocumentTelechargementRequest;
 use WBW\Library\Pappers\Request\EntrepriseRequest;
 use WBW\Library\Pappers\Request\RechercheDirigeantsRequest;
@@ -30,6 +29,7 @@
 use WBW\Library\Pappers\Response\SuggestionsResponse;
 use WBW\Library\Pappers\Serializer\RequestSerializer;
 use WBW\Library\Pappers\Serializer\ResponseDeserializer;
+use WBW\Library\Provider\Exception\ApiException;
 
 /**
  * API v2 provider.
diff --git a/src/Provider/AbstractProvider.php b/src/Provider/AbstractProvider.php
index aaca5c2..d1b35a7 100644
--- a/src/Provider/AbstractProvider.php
+++ b/src/Provider/AbstractProvider.php
@@ -16,8 +16,8 @@
 use GuzzleHttp\Exception\GuzzleException;
 use InvalidArgumentException;
 use Psr\Log\LoggerInterface;
-use WBW\Library\Core\Exception\ApiException;
 use WBW\Library\Pappers\Request\AbstractRequest;
+use WBW\Library\Provider\Exception\ApiException;
 use WBW\Library\Provider\Provider\AbstractProvider as BaseProvider;
 
 /**
diff --git a/src/Serializer/JsonDeserializer.php b/src/Serializer/JsonDeserializer.php
index 7e015da..fbd6ce8 100644
--- a/src/Serializer/JsonDeserializer.php
+++ b/src/Serializer/JsonDeserializer.php
@@ -11,7 +11,6 @@
 
 namespace WBW\Library\Pappers\Serializer;
 
-use WBW\Library\Core\Argument\Helper\ArrayHelper;
 use WBW\Library\Pappers\Model\Acte;
 use WBW\Library\Pappers\Model\BeneficiaireEffectif;
 use WBW\Library\Pappers\Model\Compte;
@@ -33,6 +32,7 @@
 use WBW\Library\Pappers\Model\Representant;
 use WBW\Library\Pappers\Model\Statuts;
 use WBW\Library\Pappers\Model\Titre;
+use WBW\Library\Types\Helper\ArrayHelper;
 
 /**
  * JSON deserializer.
diff --git a/src/Serializer/RequestSerializer.php b/src/Serializer/RequestSerializer.php
index 6752ef5..48a6433 100644
--- a/src/Serializer/RequestSerializer.php
+++ b/src/Serializer/RequestSerializer.php
@@ -11,8 +11,6 @@
 
 namespace WBW\Library\Pappers\Serializer;
 
-use WBW\Library\Core\Argument\Helper\ArrayHelper;
-use WBW\Library\Core\Argument\Helper\StringHelper;
 use WBW\Library\Pappers\Request\AbstractRechercheRequest;
 use WBW\Library\Pappers\Request\DocumentTelechargementRequest;
 use WBW\Library\Pappers\Request\EntrepriseRequest;
@@ -21,6 +19,8 @@
 use WBW\Library\Pappers\Request\RecherchePublicationsRequest;
 use WBW\Library\Pappers\Request\RechercheRequest;
 use WBW\Library\Pappers\Request\SuggestionsRequest;
+use WBW\Library\Types\Helper\ArrayHelper;
+use WBW\Library\Types\Helper\StringHelper;
 
 /**
  * Request serializer.
diff --git a/src/Serializer/ResponseDeserializer.php b/src/Serializer/ResponseDeserializer.php
index aea9bb7..8e3206d 100644
--- a/src/Serializer/ResponseDeserializer.php
+++ b/src/Serializer/ResponseDeserializer.php
@@ -11,7 +11,6 @@
 
 namespace WBW\Library\Pappers\Serializer;
 
-use WBW\Library\Core\Argument\Helper\ArrayHelper;
 use WBW\Library\Pappers\Response\AbstractRechercheResponse;
 use WBW\Library\Pappers\Response\AbstractResponse;
 use WBW\Library\Pappers\Response\DocumentTelechargementResponse;
@@ -21,6 +20,7 @@
 use WBW\Library\Pappers\Response\RecherchePublicationsResponse;
 use WBW\Library\Pappers\Response\RechercheResponse;
 use WBW\Library\Pappers\Response\SuggestionsResponse;
+use WBW\Library\Types\Helper\ArrayHelper;
 
 /**
  * Response deserializer.
diff --git a/tests/Provider/APIv1ProviderTest.php b/tests/Provider/APIv1ProviderTest.php
index 17a1f5d..8e1edf9 100644
--- a/tests/Provider/APIv1ProviderTest.php
+++ b/tests/Provider/APIv1ProviderTest.php
@@ -13,7 +13,6 @@
 
 use Exception;
 use InvalidArgumentException;
-use WBW\Library\Core\Exception\ApiException;
 use WBW\Library\Pappers\Provider\APIv1Provider;
 use WBW\Library\Pappers\Request\DocumentTelechargementRequest;
 use WBW\Library\Pappers\Request\EntrepriseRequest;
@@ -22,6 +21,7 @@
 use WBW\Library\Pappers\Response\EntrepriseResponse;
 use WBW\Library\Pappers\Response\RechercheResponse;
 use WBW\Library\Pappers\Tests\AbstractTestCase;
+use WBW\Library\Provider\Exception\ApiException;
 
 /**
  * API v1 provider test.
diff --git a/tests/Provider/APIv2ProviderTest.php b/tests/Provider/APIv2ProviderTest.php
index 2cc5898..7d80106 100644
--- a/tests/Provider/APIv2ProviderTest.php
+++ b/tests/Provider/APIv2ProviderTest.php
@@ -12,7 +12,6 @@
 namespace WBW\Library\Pappers\Tests\Provider;
 
 use Exception;
-use WBW\Library\Core\Exception\ApiException;
 use WBW\Library\Pappers\Provider\APIv2Provider;
 use WBW\Library\Pappers\Request\DocumentTelechargementRequest;
 use WBW\Library\Pappers\Request\EntrepriseRequest;
@@ -29,6 +28,7 @@
 use WBW\Library\Pappers\Response\RechercheResponse;
 use WBW\Library\Pappers\Response\SuggestionsResponse;
 use WBW\Library\Pappers\Tests\AbstractTestCase;
+use WBW\Library\Provider\Exception\ApiException;
 
 /**
  * API v2 provider test.
diff --git a/tests/Provider/AbstractProviderTest.php b/tests/Provider/AbstractProviderTest.php
index cf32226..d9e002f 100644
--- a/tests/Provider/AbstractProviderTest.php
+++ b/tests/Provider/AbstractProviderTest.php
@@ -11,7 +11,7 @@
 
 namespace WBW\Library\Pappers\Tests\Provider;
 
-use WBW\Library\Core\Logger\NullLogger;
+use Psr\Log\LoggerInterface;
 use WBW\Library\Pappers\Tests\AbstractTestCase;
 use WBW\Library\Pappers\Tests\Fixtures\Provider\TestProvider;
 
@@ -44,7 +44,7 @@ public function testSetApiToken(): void {
     public function test__construct(): void {
 
         // Set a Logger mock.
-        $logger = new NullLogger();
+        $logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
 
         $this->assertEquals("https://api.pappers.fr", TestProvider::ENDPOINT_PATH);