diff --git a/.all-contributorsrc b/.all-contributorsrc
index 4f1333f..1528393 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -74,4 +74,4 @@
   "repoType": "github",
   "repoHost": "https://github.com",
   "skipCi": true
-}
+}
\ No newline at end of file
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 781e3b3..dfba794 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -1,4 +1,4 @@
-name: Build
+name: Run Tests
 
 on:
   push:
@@ -12,27 +12,43 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ['8.0', '7.4', '7.3', '7.2']
+        dependency-version: [prefer-lowest, prefer-stable]
+
+    name: PHP ${{ matrix.php }} - ${{ matrix.dependency-version }}
 
     steps:
-    - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: mbstring, intl
+          ini-values: post_max_size=256M, log_errors=1
+          coverage: pcov
+          tools: pecl
 
-    - name: Validate composer.json and composer.lock
-      run: composer validate
+      - name: Validate composer.json and composer.lock
+        run: composer validate
       
-    - name: Cache Composer packages
-      id: composer-cache
-      uses: actions/cache@v2
-      with:
-        path: vendor
-        key: ${{ runner.os }}-node-${{ hashFiles('**/composer.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: Install dependencies
-      if: steps.composer-cache.outputs.cache-hit != 'true'
-      run: composer install --prefer-dist --no-progress --no-suggest
-
-    - name: Run test suite
-      run: vendor/bin/phpunit
+      - name: Cache Composer packages
+        id: composer-cache
+        uses: actions/cache@v2
+        with:
+          path: vendor
+          key: ${{ runner.os }}-node-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+
+      - name: Install dependencies
+        if: steps.composer-cache.outputs.cache-hit != 'true'
+        run: composer install --prefer-dist --no-progress --no-suggest
+
+      - name: Run test suite
+        run: vendor/bin/phpunit
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d3610c5..2e64aaa 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,9 +1,13 @@
 # CONTRIBUTING
 
-Contributions are welcome, and are accepted via pull requests.
-Please review these guidelines before submitting any pull requests.
+Thank you for your interest in wanting to contribute to Socrates!<br>
+Up next is a small guide to create your first pull request. Check further below for a 
+[walk-through](#how-to-implement-a-country-from-scratch) on how to
+contribute with a new country from scratch.
 
-## Process
+## The Basics
+
+### Process
 
 1. Fork the project
 1. Create a new branch
@@ -11,18 +15,469 @@ Please review these guidelines before submitting any pull requests.
 1. Open a pull request detailing your changes.
 1. Describe what your pull request is (change, bugfix, new country implementation, etc.)
 
-## Guidelines
+### Guidelines
 
-* We use PSR-12 as our coding style, make sure to follow it.
-* If you have multiple commits, squashing some of them might help us have a better sense of what you did.
+* We use [PSR-12](https://www.php-fig.org/psr/psr-12/) as our coding style, make sure to follow it.
+* If you have multiple commits, squashing some of them might help us better understand what you did.
 * You may need to [rebase](https://git-scm.com/book/en/v2/Git-Branching-Rebasing) to avoid merge conflicts.
 
-## Setup
+### Setup
 
 Clone your fork, then install the dev dependencies:
 ```bash
 composer install
 ```
 
-It is avised to run a Laravel/Vanilla PHP application locally, and pull in your local fork of the package to test.
+It is advised to run a Laravel/Vanilla PHP application locally, and pull in your local fork of the package to test.
 Check [this post](https://johnbraun.blog/posts/creating-a-laravel-package-1) for a guide on how to do it.
+
+## How to implement a country from scratch
+
+### Step 1 - Research
+
+Let's imagine we want to implement the fictional european country of "Socratia".<br>The first thing we should do
+is find out what its two-digit ISO code is. After that, we need to *thoroughly* research and find out what the 
+Socratia's National Identification Number is (henceforth referred to as NIN) and how it is validated, as well as 
+collect some example specimens to then write our tests. Additionally, we should find out if the NIN encodes any personal 
+information on the Citizen - gender, date of birth or place of birth.
+
+After some imaginary googling we find out that:
+- The two-digit ISO code is `SC`.
+- The NIN is eleven characters long excluding hyphens.
+- The NIN follows the format `GR-DDDDDDDD-C`, G a letter for gender, R a letter for region, the Ds
+  are numbers representing a date and C is a control number.
+- `G` can either be "M" or "F".
+- `R` can be "P", "J" or "R" referring to its three regions of "Phpilia", "Javardia" and "Rustara".
+- `C` must be an even number, but it can not be "2" if the citizen was registered after 2001 as those particular 
+  numbers have been phased out.
+
+Clearly there is some citizen information encoded in that ID. This means we will implement both a Validator and 
+an Extractor.<br>
+
+
+### Step 2 - Implement the Validator
+
+Let's start working on our implementation. First we need to create the validator class. <br>
+Create a directory in `src/Core/Europe/` named "Socratia" and create a new PHP class inside it.
+We'll name it `SocratiaIdvalidator` and implement `IdValidator`:
+
+```php
+<?php
+
+namespace Reducktion\Socrates\Core\Europe\Socratia;
+
+use Reducktion\Socrates\Contracts\IdValidator;
+
+class SocratiaIdValidator implements IdValidator
+{
+    // Implementing the `IdValidator` means we will need to implement the `validate` method
+    public function validate(string $id): bool
+    {
+        // TODO implement
+    }
+}
+```
+
+We follow a "fail early" approach, so we first make sure
+that the ID is not invalid before any further computations. <br>
+Let's go ahead and do that now:
+
+```php
+<?php
+
+namespace Reducktion\Socrates\Core\Europe\Socratia;
+
+use Reducktion\Socrates\Contracts\IdValidator;
+use Reducktion\Socrates\Exceptions\InvalidLengthException;
+
+class SocratiaIdValidator implements IdValidator
+{
+    public function validate(string $id): bool
+    {
+        $id = $this->sanitize($id);
+    }
+    
+    // We usually create a sanitize method to strip the
+    // ID of any separator characters and check its length.
+    private function sanitize($string $id): string
+    {
+        $id = str_replace('-', '', $id);
+
+        $idLength = strlen($id);
+        
+        // We want an eleven character string after stripping it from hyphens, else
+        // we throw one of our internal exceptions.
+
+        if ($idLength !== 11) {
+            throw new InvalidLengthException('Socratian NIN', '11', $idLength);
+        }
+        
+        $id = strtoupper($id);
+
+        return $id;
+    }
+}
+```
+
+Great! We can now check the other conditions and implement the rest of the `validate()` method:
+
+```php
+public function validate(string $id): bool
+{
+    $id = $this->sanitize($id);
+    
+    // Characters #3 to #10 must be digits
+    $dateDigits = substr($id, 2, 8);
+    if (!is_numeric($dateDigits)) {
+        return false;
+    }
+    
+    // `G` can either be "M" or "F"
+    $genderCharacter = $id[0];
+    if ($genderCharacter !== 'M' && $genderCharacter !== 'F') {
+        return false;
+    }
+    
+    // `R` can be "P", "J" or "R"
+    $regionCharacter = $id[1];
+    if ($regionCharacter !== 'P' && $regionCharacter !== 'J' && $regionCharacter !== 'R') {
+        return false;
+    }
+    
+    // `C` must be an even number, but it can not be "2" if the citizen was registered after 2001
+    $controlDigit = (int) $id[10];
+    $year = (int) substr($dateDigits, 0, 4);
+    if ($controlDigit === 2 && $year >= 2001) {
+        return false;
+    }
+    
+    if ($controlDigit % 2 !== 0) {
+        return false;
+    }
+    
+    // Don't accept silly dates like 2010-99-99
+    $month = (int) substr($dateDigits, 4, 2);
+    $day = (int) substr($dateDigits, 6, 2);
+    try {
+        new DateTime("$year-$month-$day");
+    } catch (Exception $e) {
+        return false;
+    }
+    
+    // The ID is valid!
+    return true;
+}
+```
+That's it for our validator!
+Now we head off to `Countries.php` and add the class to the validators array. You'll notice it is alphabetically ordered
+and organised by the continent, so let's be sure to add it in the right place:
+
+```php
+<?php
+
+namespace Reducktion\Socrates\Config;
+
+abstract class Countries
+{
+    //...
+    public static $validators = [
+        /**
+         * Validators for european countries.
+         */
+        'AL' => \Reducktion\Socrates\Core\Europe\Albania\AlbaniaIdValidator::class,
+        //...
+        'SC' => \Reducktion\Socrates\Core\Europe\Socratia\SocratiaIdValidator::class,
+        'SE' => \Reducktion\Socrates\Core\Europe\Sweden\SwedenIdValidator::class,
+        //...
+```
+
+Let's also add a constant to `Country.php` with our country code for convenience:
+
+```php
+<?php
+
+namespace Reducktion\Socrates\Constants;
+
+abstract class Country
+{
+    /**
+     * European countries
+     */
+    public const ALBANIA = 'AL';
+    //...
+    public const SOCRATIA = 'SC';
+    public const SWEDEN = 'SE';
+    // ...
+```
+
+### Step 3 - Implement the Extractor
+
+Now we create an extractor class in the same directory as the validator:
+
+```php
+<?php
+
+namespace Reducktion\Socrates\Core\Europe\Socratia;
+
+use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
+use Reducktion\Socrates\Models\Citizen;
+
+class SocratiaCitizenInformationExtractor implements CitizenInformationExtractor
+{
+    public function extract(string $id): Citizen
+    {
+        // TODO implement
+    }
+}
+```
+
+Unlike the validator contract, this one requires us to return an instance of `Citizen`.
+Citizen is a simple POPO that allows us to return the encoded information in the ID in a consistent format.
+
+To begin, let us first check that the incoming ID is valid by referencing our validator:
+
+```php
+public function extract(string $id): Citizen
+{
+    // We still need to sanitize the ID! Assume the same method as in the validator.
+    $id = $this->sanitize($id);
+
+    if (! (new SocratiaIdValidator())->validate($id)) {
+        // Throw one of our internal exceptions
+        throw new InvalidIdException();
+    }
+    
+    // We are good to go
+}
+```
+
+A good practice is to segment each piece logic for each type of information in its own method.
+If you recall from above, we can extract the gender, date of birth and place of birth from the Socratian ID.
+Our `extract` method then becomes:
+
+```php
+public function extract(string $id): Citizen
+{
+    $id = $this->sanitize($id);
+
+    if (! (new SocratiaIdValidator())->validate($id)) {
+        // Throw one of our internal exceptions
+        throw new InvalidIdException();
+    }
+    
+    $gender = $this->getGender($id);
+    $dateOfBirth = $this->getDateOfBirth($id);
+    $placeOfBirth = $this->getPlaceOfBirth($id);
+
+    $citizen = new Citizen();
+    $citizen->setGender($gender);
+    $citizen->setDateOfBirth($dateOfBirth);
+    $citizen->setPlaceOfBirth($placeOfBirth);
+
+    return $citizen;
+}
+```
+
+Let us do each in order. Getting the gender is simple. Because we have already validated the ID we
+can be confident that the gender character is safe to check:
+
+```php
+public function getGender(string $id): string
+{
+    // Use our internal "enum"
+    return $id[0] === 'M' ? Gender::MALE : Gender::FEMALE;
+}
+```
+
+Now for the date:
+
+```php
+public function getDateOfBirth(string $id): DateTime
+{
+    $dateDigits = substr($id, 2, 8);
+    
+    $year = (int) substr($dateDigits, 0, 4);
+    $month = (int) substr($dateDigits, 4, 2);
+    $day = (int) substr($dateDigits, 6, 2);
+    
+    return new DateTime("$year-$month-$day");
+}
+```
+
+For the place of birth let us create a separate class in the same directory to hold all possible region values:
+
+```php
+<?php
+
+namespace Reducktion\Socrates\Core\Europe\Socratia;
+
+class SocratiaRegionsList
+{
+    public static $regions = [
+        'P' => 'Phpilia',
+        'J' => 'Javardia',
+        'R' => 'Rustaria',
+    ];
+}
+```
+
+Getting the place of birth is now as simple as:
+
+```php
+private function getPlaceOfBirth(string $id): string
+{
+    $regionCharacter = $id[1];
+
+    if (! isset(SocratiaRegionsList::$regions[$regionCharacter])) {
+        // Throw another of our internal exceptions
+        throw new UnrecognisedPlaceOfBirthException(
+            "The provided character '$regionCharacter' does not match any regions."
+        );
+    }
+
+    return SocratiaRegionsList::$regions[$regionCharacter];
+  }
+```
+
+Finally, as before, let us register our extractor class in the extractors array in `Countries.php`:
+
+```php
+<?php
+
+namespace Reducktion\Socrates\Config;
+
+abstract class Countries
+{
+    //...
+    public static $extractors = [
+        /**
+         * Extractors for european countries.
+         */
+        'AL' => \Reducktion\Socrates\Core\Europe\Albania\AlbaniaCitizenInformationExtractor::class,
+        //...
+        'SC' => \Reducktion\Socrates\Core\Europe\Socratia\SocratiaCitizenInformationExtractor::class,
+        'SE' => \Reducktion\Socrates\Core\Europe\Sweden\SwedenCitizenInformationExtractor::class,
+        //...
+```
+
+That's it! We have implemented both the validator and the extractor for our fictional country.
+However, we are not done yet as we need to...
+
+### Step 4 - Write Tests
+
+We want to ensure the quality of the algorithm and the extracted data. To do so, we will now write a test class.
+First head over to `tests/Feature/Europe` and create a new `SocratiaTest` test class. We will extend our `FeatureTest`
+abstract class:
+
+```php
+<?php
+
+namespace Reducktion\Socrates\Tests\Feature\Europe;
+
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
+
+class SocratiaTest extends FeatureTest
+{
+    public function test_extract_behaviour(): void
+    {
+        // TODO implement
+    }
+    
+    public function test_validation_behaviour(): void
+    {
+        // TODO implement
+    }
+}
+```
+
+To stay consistent with our other tests, let's create two fields in our class: one for people and another one holding
+invalid ids. We shall initialize them in the `setUp()` method:
+
+```php
+private $people; // This would be $validIds if Socratia only had a validator
+private $invalidIds;
+
+protected function setUp(): void
+{
+    parent::setUp();
+    
+    // Make this an array of arrays.
+    $this->people = [
+        'alexandre' => [
+            'id' => 'MR-19940916-4',
+            'gender' => Gender::MALE,
+            'dob' => new DateTime('1994-09-16'),
+            'age' => 26, // as of 2021
+            'pob' => 'Rustaria',
+        ],
+        // ...
+    ];
+    
+    // Try to cover as many edge cases as possible
+    $this->invalidIds = [
+        'OR-19940916-4', // Gender is wrong
+        'MZ-19940916-4', // Place of birth does not exist
+        'MR-19941916-4', // Date of birth is invalid
+        'MR-19940916-3', // Control digit is not even
+        'MR-20020916-3', // Control digit is two but the citizen was born post 2001
+        'MR-020916-3', // ID is too short
+        // ...
+    ];
+}
+```
+
+Now for each of those two data sets we run our validator and extractor classes and check if all is well:
+
+```php
+public function test_extract_behaviour(): void
+{
+    foreach ($this->people as $person) {
+        $citizen = Socrates::getCitizenDataFromId($person['id'], Country::SOCRATIA);
+
+        self::assertEquals($person['gender'], $citizen->getGender());
+        self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+        self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+        self::assertEquals($person['age'], $citizen->getAge());
+        self::assertEquals($person['pob'], $citizen->getPlaceOfBirth());
+    }
+
+    $this->expectException(InvalidIdException::class);
+
+    // An invalid ID should not be able to be extracted
+    Socrates::getCitizenDataFromId('OR-19940916-4', 'SC');
+}
+
+public function test_validation_behaviour(): void
+{
+    foreach ($this->people as $person) {
+        self::assertTrue(
+            Socrates::validateId($person['id'], 'SC')
+        );
+    }
+
+    foreach ($this->invalidIds as $fc) {
+        self::assertFalse(
+            Socrates::validateId($fc, 'SC')
+        );
+    }
+
+    $this->expectException(InvalidLengthException::class);
+
+    Socrates::validateId('OR-940916-4', 'SC');
+}
+```
+
+### Final step - Update the documentation
+
+Finally we just need to update our `COUNTRIES.md` file for reference:
+
+```text
+| Country                   | Country Code |     Validation     |     Extraction     |
+|---------------------------|--------------|--------------------|--------------------|
+| Albania 🇦🇱                |      AL      | :heavy_check_mark: | :heavy_check_mark: |
+(...)
+| Socratia 🏴               |      SC      | :heavy_check_mark: | :heavy_check_mark: |
+| Sweden 🇸🇪                 |      SE      | :heavy_check_mark: | :heavy_check_mark: |
+```
+
+Congratulations! Now go ahead and implement a real country! 😊
\ No newline at end of file
diff --git a/COUNTRIES.md b/COUNTRIES.md
index b5dca90..70cab75 100644
--- a/COUNTRIES.md
+++ b/COUNTRIES.md
@@ -3,16 +3,20 @@
 | Country                   | Country Code |     Validation     |     Extraction     |
 |---------------------------|--------------|--------------------|--------------------|
 | Albania 🇦🇱                |      AL      | :heavy_check_mark: | :heavy_check_mark: |
+| Argentina 🇦🇷              |      AR      | :heavy_check_mark: | :x: |
 | Belgium 🇧🇪                |      BE      | :heavy_check_mark: | :heavy_check_mark: |
 | Bosnia and Herzegovina 🇧🇦 |      BA      | :heavy_check_mark: | :heavy_check_mark: |
 | Bulgaria 🇧🇬               |      BG      | :heavy_check_mark: | :heavy_check_mark: |
 | Brazil 🇧🇷                 |      BR      | :heavy_check_mark: | :x:                |
+| Chile 🇨🇱                  |      CL      | :heavy_check_mark: | :x:                |
 | Croatia 🇭🇷                |      HR      | :heavy_check_mark: | :heavy_check_mark: |
 | Czech Republic 🇨🇿         |      CZ      | :heavy_check_mark: | :heavy_check_mark: |
 | Denmark 🇩🇰                |      DK      | :heavy_check_mark: | :heavy_check_mark: |
+| Ecuador 🇪🇨                |      EC      | :heavy_check_mark: | :x:                |
 | Estonia 🇪🇪                |      EE      | :heavy_check_mark: | :heavy_check_mark: |
 | Finland 🇫🇮                |      FI      | :heavy_check_mark: | :heavy_check_mark: |
 | France 🇫🇷                 |      FR      | :heavy_check_mark: | :heavy_check_mark: |
+| Germany 🇩🇪                |      DE      | :heavy_check_mark: | :x:                |
 | Greece 🇬🇷                 |      GR      | :heavy_check_mark: | :x:                |
 | Hungary 🇭🇺                |      HU      | :heavy_check_mark: | :heavy_check_mark: |
 | Iceland 🇮🇸                |      IS      | :heavy_check_mark: | :heavy_check_mark: |
@@ -21,12 +25,13 @@
 | Kosovo 🇽🇰                 |      XK      | :heavy_check_mark: | :heavy_check_mark: |
 | Latvia 🇱🇻                 |      LV      | :heavy_check_mark: | :heavy_check_mark: |
 | Lithuania 🇱🇹              |      LT      | :heavy_check_mark: | :heavy_check_mark: |
-| Luxembourg 🇱🇺             |      LU      | :heavy_check_mark: | :heavy_check_mark: |
 | Moldova 🇲🇩                |      MD      | :heavy_check_mark: | :x:                |
 | Montenegro 🇲🇪             |      ME      | :heavy_check_mark: | :heavy_check_mark: |
+| México 🇲🇽                 |      ME      | :heavy_check_mark: | :heavy_check_mark: |
 | Netherlands 🇳🇱            |      NL      | :heavy_check_mark: | :x:                |
 | North Macedonia 🇲🇰        |      MK      | :heavy_check_mark: | :heavy_check_mark: |
 | Norway 🇳🇴                 |      NO      | :heavy_check_mark: | :heavy_check_mark: |
+| Peru 🇵🇪                   |      PE      | :heavy_check_mark: | :x:                |
 | Poland 🇵🇱                 |      PL      | :heavy_check_mark: | :heavy_check_mark: |
 | Portugal 🇵🇹               |      PT      | :heavy_check_mark: | :x:                |
 | Romania 🇷🇴                |      RO      | :heavy_check_mark: | :heavy_check_mark: |
@@ -39,3 +44,4 @@
 | Turkey 🇹🇷                 |      TR      | :heavy_check_mark: | :x:                |
 | Ukraine 🇺🇦                |      UA      | :heavy_check_mark: | :heavy_check_mark: |
 | United Kingdom 🇬🇧         |      GB      | :heavy_check_mark: | :x:                |
+| Uruguay 🇺🇾                |      UY      | :heavy_check_mark: | :x:                |
diff --git a/README.md b/README.md
index 51a59e5..bf25cfc 100644
--- a/README.md
+++ b/README.md
@@ -19,19 +19,14 @@
 
 <i>You can now read [a blog post](https://medium.com/@alex.olival/road-to-mastery-building-an-open-source-package-3936f57aed81) about how this package was created and its goals.</i>
 
-**Socrates** is a PHP Package that allows you to validate and retrieve personal data from [National Identification Numbers](https://en.wikipedia.org/wiki/National_identification_number). At the moment, most countries in Europe are supported, but the goal is to eventually support as many countries in the world as possible.
+**Socrates** is a PHP Package that allows you to validate and retrieve personal data from [National Identification Numbers](https://en.wikipedia.org/wiki/National_identification_number).
+Most countries in Europe are supported as well as some American ones, but the goal is to eventually support as many countries in the world as possible.
 <p>Some countries also encode personal information of the citizen, such as gender or the place of birth. This package allows you to extract that information in a consistent way.</p>
-<p>For Laravel, a Facade and request Validator is also available (see below).</p>
+<p>A Facade and Validation Rule is also available for Laravel (see below).</p>
 <p>This package can be useful for many things, such as validating a user's ID for finance related applications or verifying a user's age without asking for it explicitly. However, we recommend you review your country's data protection laws before storing any information.</p>
 
 [Ports](https://github.com/reducktion/socrates#ports) of this package to other languages are currently in progress. Check further below for which ones are currently available.
 
-Our goals:
-* Standardize and centralise what is usually very difficult and sparse information to find.
-* Have a consistent API for retrieving citizen information from an ID, if available.
-* Test each individual country validation and data extraction algorithm with a number of valid and invalid IDs.
-* Support as many countries as viably possible.
-
 ## Installation
 `composer require reducktion/socrates`
 
@@ -40,63 +35,66 @@ Socrates provides two methods: `validateId` and `getCitizenDataFromId`. Both rec
 
 ```php
 use Reducktion\Socrates\Socrates;
+use Reducktion\Socrates\Constants\Country;
 
 $socrates = new Socrates();
+$socrates->validateId('14349483 0 ZV3', Country::PORTUGAL);
+// or
 $socrates->validateId('14349483 0 ZV3', 'PT');
 ```
 
-For Laravel, a facade is also available for your convenience:
+If you're using Laravel a facade is also available for your convenience:
 
 ```php
 use Reducktion\Socrates\Laravel\Facades\Socrates;
+use Reducktion\Socrates\Constants\Country;
 
-Socrates::getCitizenDataFromId('550309-6447', 'SE');
+Socrates::getCitizenDataFromId('550309-6447', Country::SWEDEN);
 ```
 
-You can also use the `national_id:[COUNTRY CODE]` request validation rule:
+Still in Laravel you can use the `national_id:[COUNTRY CODE]` request validation rule.
+Here is an example checking if a request parameter is a valid latvian ID:
 
 ```php
 $request->validate([
-    'id' => 'national_id:lv'
+    'national_id' => 'required|string|national_id:lv',
 ]);
 ```
-Still in Laravel, the package will try to guess the country to be validated by the default locale:
-
-```php
-App::setLocale('PT');
-
-Socrates::validateId('11084129 8 ZX8');
-```
- 
-However this is **not** recommended. The safest way is to always explicitly pass the country code as the second parameter.
 
 ### validateId
-This method will return true or false depending on the validity of the ID.
+This method will return true or false.
 In case the ID has the wrong character length, an `InvalidLengthException` will be thrown.
 
 ```php
-if ($socrates->validateId('719102091', 'NL')) {
-    echo 'Valid ID.'
+if ($socrates->validateId('719102091', Country::NETHERLANDS)) {
+    echo 'Valid ID.';
 } else {
-    echo 'Invalid ID.'
+    echo 'Invalid ID.';
 }
 ```
 
 ### getCitizenDataFromId
-This method will return an instance of `Citizen`. If the ID is invalid, an `InvalidIdException` will be thrown. If the country does not support data extraction, an `UnsupportedOperationException` will be thrown.
+This method will return an instance of `Citizen`.<br>
+If the ID is invalid, an `InvalidIdException` will be thrown.<br>
+If the country does not support data extraction, an `UnsupportedOperationException` will be thrown.
 
 ```php
-$citizen = $socrates->getCitizenDataFromId('3860123012', 'EE');
+$citizen = $socrates->getCitizenDataFromId('3860123012', Country::ESTONIA);
 ```
 
-The `Citizen` class stores the extracted citizen data in a consistent format across all countries. It exposes the `getGender()`, `getDateOfBirth()`, `getAge()` and `getPlaceOfBirth()` methods.
-All will return a `string` (for the gender and place of birth), `int`(for age), a `Carbon` instance (for the date of birth) or `null` if the value is empty.
+The `Citizen` class stores the extracted citizen data in a consistent format across all countries.<br>
+It exposes the `getGender()`, `getDateOfBirthNative()`, `getDateOfBirth()`, `getAge()` and `getPlaceOfBirth()` methods.<br><br>
+`getGender` and `getPlaceOfBirth` return a `string`.<br>
+`getAge()` returns an `int`.<br>
+`getDateOfBirthNative()` returns a native `DateTime` and `getDateOfBirth()` returns a `Carbon` instance.<br>
+**It is recommended to use `getDateOfBirthNative()` as Carbon will be removed as a dependency in a future release of Socrates.**
 <p>Using the example above, Estonia only encodes the date of birth and gender of the citizen in their ID. So the above methods will return:</p>
  
 ```php
 echo $citizen->getGender(); // 'Male'
-echo $citizen->getDateOfBirth(); // A Carbon instance with the date '1986-01-23'
-echo $citizen->getAge(); // 34 (as of June 2020)
+echo $citizen->getDateOfBirthNative(); // DateTime instance with the date '1986-01-23'
+echo $citizen->getDateOfBirth(); // DEPRECATED - Carbon instance with the date '1986-01-23'
+echo $citizen->getAge(); // 34
 echo $citizen->getPlaceOfBirth(); // null
 ```
 
@@ -104,7 +102,8 @@ echo $citizen->getPlaceOfBirth(); // null
 
 [Here](COUNTRIES.md) you can see the full list of supported countries and whether they support data extraction.
 
-Four european countries are currently unsupported: Austria 🇦🇹, Belarus 🇧🇾, Cyprus 🇨🇾 and Germany 🇩🇪. This is because we could not find a reliable source for the algorithm, if at all. Help would be appreciated to get these countries supported.
+Four european countries are currently unsupported: Austria 🇦🇹, Belarus 🇧🇾, Cyprus 🇨🇾 and Luxembourg 🇱🇺.
+A number of countries in the Americas are also unsupproted. This is because we could not find a reliable source for the algorithm, if at all. Help would be appreciated to get these countries supported.
 
 ## Testing
 `composer test`
@@ -168,4 +167,4 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 <!-- prettier-ignore-end -->
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
-This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
\ No newline at end of file
diff --git a/composer.json b/composer.json
index cf87335..a423b0d 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.2|^8.0",
         "nesbot/carbon": "^2.35.0"
     },
     "require-dev": {
diff --git a/docs/example.png b/docs/example.png
index a1a928e..1bd0f90 100644
Binary files a/docs/example.png and b/docs/example.png differ
diff --git a/src/Config/Countries.php b/src/Config/Countries.php
index 291f433..5bfb4c1 100644
--- a/src/Config/Countries.php
+++ b/src/Config/Countries.php
@@ -2,7 +2,7 @@
 
 namespace Reducktion\Socrates\Config;
 
-class Countries
+abstract class Countries
 {
     public static $all = [
         'AF',
@@ -258,72 +258,98 @@ class Countries
     ];
 
     public static $validators = [
-        'AL' => \Reducktion\Socrates\Core\Albania\AlbaniaIdValidator::class,
-        'BA' => \Reducktion\Socrates\Core\BosniaAndHerzegovina\BosniaAndHerzegovinaIdValidator::class,
-        'BE' => \Reducktion\Socrates\Core\Belgium\BelgiumIdValidator::class,
-        'BG' => \Reducktion\Socrates\Core\Bulgaria\BulgariaIdValidator::class,
-        'BR' => \Reducktion\Socrates\Core\Brazil\BrazilIdValidator::class,
-        'CH' => \Reducktion\Socrates\Core\Switzerland\SwitzerlandIdValidator::class,
-        'CZ' => \Reducktion\Socrates\Core\CzechRepublic\CzechRepublicIdValidator::class,
-        'DK' => \Reducktion\Socrates\Core\Denmark\DenmarkIdValidator::class,
-        'EE' => \Reducktion\Socrates\Core\Estonia\EstoniaIdValidator::class,
-        'ES' => \Reducktion\Socrates\Core\Spain\SpainIdValidator::class,
-        'FI' => \Reducktion\Socrates\Core\Finland\FinlandIdValidator::class,
-        'FR' => \Reducktion\Socrates\Core\France\FranceIdValidator::class,
-        'GB' => \Reducktion\Socrates\Core\UnitedKingdom\UnitedKingdomIdValidator::class,
-        'GR' => \Reducktion\Socrates\Core\Greece\GreeceIdValidator::class,
-        'HR' => \Reducktion\Socrates\Core\Croatia\CroatiaIdValidator::class,
-        'HU' => \Reducktion\Socrates\Core\Hungary\HungaryIdValidator::class,
-        'IE' => \Reducktion\Socrates\Core\Ireland\IrelandIdValidator::class,
-        'IS' => \Reducktion\Socrates\Core\Iceland\IcelandIdValidator::class,
-        'IT' => \Reducktion\Socrates\Core\Italy\ItalyIdValidator::class,
-        'LT' => \Reducktion\Socrates\Core\Lithuania\LithuaniaIdValidator::class,
-        'LU' => \Reducktion\Socrates\Core\Luxembourg\LuxembourgIdValidator::class,
-        'LV' => \Reducktion\Socrates\Core\Latvia\LatviaIdValidator::class,
-        'MD' => \Reducktion\Socrates\Core\Moldova\MoldovaIdValidator::class,
-        'ME' => \Reducktion\Socrates\Core\Montenegro\MontenegroIdValidator::class,
-        'MK' => \Reducktion\Socrates\Core\NorthMacedonia\NorthMacedoniaIdValidator::class,
-        'NL' => \Reducktion\Socrates\Core\Netherlands\NetherlandsIdValidator::class,
-        'NO' => \Reducktion\Socrates\Core\Norway\NorwayIdValidator::class,
-        'PL' => \Reducktion\Socrates\Core\Poland\PolandIdValidator::class,
-        'PT' => \Reducktion\Socrates\Core\Portugal\PortugalIdValidator::class,
-        'RO' => \Reducktion\Socrates\Core\Romania\RomaniaIdValidator::class,
-        'RS' => \Reducktion\Socrates\Core\Serbia\SerbiaIdValidator::class,
-        'SE' => \Reducktion\Socrates\Core\Sweden\SwedenIdValidator::class,
-        'SI' => \Reducktion\Socrates\Core\Slovenia\SloveniaIdValidator::class,
-        'SK' => \Reducktion\Socrates\Core\Slovakia\SlovakiaIdValidator::class,
-        'TR' => \Reducktion\Socrates\Core\Turkey\TurkeyIdValidator::class,
-        'UA' => \Reducktion\Socrates\Core\Ukraine\UkraineIdValidator::class,
-        'XK' => \Reducktion\Socrates\Core\Kosovo\KosovoIdValidator::class,
+        /**
+         * Validators for european countries.
+         */
+        'AL' => \Reducktion\Socrates\Core\Europe\Albania\AlbaniaIdValidator::class,
+        'BA' => \Reducktion\Socrates\Core\Europe\BosniaAndHerzegovina\BosniaAndHerzegovinaIdValidator::class,
+        'BE' => \Reducktion\Socrates\Core\Europe\Belgium\BelgiumIdValidator::class,
+        'BG' => \Reducktion\Socrates\Core\Europe\Bulgaria\BulgariaIdValidator::class,
+        'CH' => \Reducktion\Socrates\Core\Europe\Switzerland\SwitzerlandIdValidator::class,
+        'CZ' => \Reducktion\Socrates\Core\Europe\CzechRepublic\CzechRepublicIdValidator::class,
+        'DE' => \Reducktion\Socrates\Core\Europe\Germany\GermanIdValidator::class,
+        'DK' => \Reducktion\Socrates\Core\Europe\Denmark\DenmarkIdValidator::class,
+        'EE' => \Reducktion\Socrates\Core\Europe\Estonia\EstoniaIdValidator::class,
+        'ES' => \Reducktion\Socrates\Core\Europe\Spain\SpainIdValidator::class,
+        'FI' => \Reducktion\Socrates\Core\Europe\Finland\FinlandIdValidator::class,
+        'FR' => \Reducktion\Socrates\Core\Europe\France\FranceIdValidator::class,
+        'GB' => \Reducktion\Socrates\Core\Europe\UnitedKingdom\UnitedKingdomIdValidator::class,
+        'GR' => \Reducktion\Socrates\Core\Europe\Greece\GreeceIdValidator::class,
+        'HR' => \Reducktion\Socrates\Core\Europe\Croatia\CroatiaIdValidator::class,
+        'HU' => \Reducktion\Socrates\Core\Europe\Hungary\HungaryIdValidator::class,
+        'IE' => \Reducktion\Socrates\Core\Europe\Ireland\IrelandIdValidator::class,
+        'IS' => \Reducktion\Socrates\Core\Europe\Iceland\IcelandIdValidator::class,
+        'IT' => \Reducktion\Socrates\Core\Europe\Italy\ItalyIdValidator::class,
+        'LT' => \Reducktion\Socrates\Core\Europe\Lithuania\LithuaniaIdValidator::class,
+        'LV' => \Reducktion\Socrates\Core\Europe\Latvia\LatviaIdValidator::class,
+        'MD' => \Reducktion\Socrates\Core\Europe\Moldova\MoldovaIdValidator::class,
+        'ME' => \Reducktion\Socrates\Core\Europe\Montenegro\MontenegroIdValidator::class,
+        'MK' => \Reducktion\Socrates\Core\Europe\NorthMacedonia\NorthMacedoniaIdValidator::class,
+        'NL' => \Reducktion\Socrates\Core\Europe\Netherlands\NetherlandsIdValidator::class,
+        'NO' => \Reducktion\Socrates\Core\Europe\Norway\NorwayIdValidator::class,
+        'PL' => \Reducktion\Socrates\Core\Europe\Poland\PolandIdValidator::class,
+        'PT' => \Reducktion\Socrates\Core\Europe\Portugal\PortugalIdValidator::class,
+        'RO' => \Reducktion\Socrates\Core\Europe\Romania\RomaniaIdValidator::class,
+        'RS' => \Reducktion\Socrates\Core\Europe\Serbia\SerbiaIdValidator::class,
+        'SE' => \Reducktion\Socrates\Core\Europe\Sweden\SwedenIdValidator::class,
+        'SI' => \Reducktion\Socrates\Core\Europe\Slovenia\SloveniaIdValidator::class,
+        'SK' => \Reducktion\Socrates\Core\Europe\Slovakia\SlovakiaIdValidator::class,
+        'TR' => \Reducktion\Socrates\Core\Europe\Turkey\TurkeyIdValidator::class,
+        'UA' => \Reducktion\Socrates\Core\Europe\Ukraine\UkraineIdValidator::class,
+        'XK' => \Reducktion\Socrates\Core\Europe\Kosovo\KosovoIdValidator::class,
+
+        /**
+         * Validators for north american countries.
+         */
+        'CA' => \Reducktion\Socrates\Core\NorthAmerica\Canada\CanadaIdValidator::class,
+        'US' => \Reducktion\Socrates\Core\NorthAmerica\UnitedStates\UnitedStatesIdValidator::class,
+        'MX' => \Reducktion\Socrates\Core\NorthAmerica\Mexico\MexicoIdValidator::class,
+
+        /**
+         * Validators for south american countries.
+         */
+        'AR' => \Reducktion\Socrates\Core\SouthAmerica\Argentina\ArgentinaIdValidator::class,
+        'BR' => \Reducktion\Socrates\Core\SouthAmerica\Brazil\BrazilIdValidator::class,
+        'CL' => \Reducktion\Socrates\Core\SouthAmerica\Chile\ChileIdValidator::class,
+        'EC' => \Reducktion\Socrates\Core\SouthAmerica\Ecuador\EcuadorIdValidator::class,
+        'PE' => \Reducktion\Socrates\Core\SouthAmerica\Peru\PeruIdValidator::class,
+        'UY' => \Reducktion\Socrates\Core\SouthAmerica\Uruguay\UruguayIdValidator::class,
     ];
 
     public static $extractors = [
-        'AL' => \Reducktion\Socrates\Core\Albania\AlbaniaCitizenInformationExtractor::class,
-        'BA' => \Reducktion\Socrates\Core\BosniaAndHerzegovina\BosniaAndHerzegovinaCitizenInformationExtractor::class,
-        'BE' => \Reducktion\Socrates\Core\Belgium\BelgiumCitizenInformationExtractor::class,
-        'BG' => \Reducktion\Socrates\Core\Bulgaria\BulgariaCitizenInformationExtractor::class,
-        'DK' => \Reducktion\Socrates\Core\Denmark\DenmarkCitizenInformationExtractor::class,
-        'CZ' => \Reducktion\Socrates\Core\CzechRepublic\CzechRepublicCitizenInformationExtractor::class,
-        'EE' => \Reducktion\Socrates\Core\Estonia\EstoniaCitizenInformationExtractor::class,
-        'FI' => \Reducktion\Socrates\Core\Finland\FinlandCitizenInformationExtractor::class,
-        'FR' => \Reducktion\Socrates\Core\France\FranceCitizenInformationExtractor::class,
-        'HR' => \Reducktion\Socrates\Core\Croatia\CroatiaCitizenInformationExtractor::class,
-        'HU' => \Reducktion\Socrates\Core\Hungary\HungaryCitizenInformationExtractor::class,
-        'IS' => \Reducktion\Socrates\Core\Iceland\IcelandCitizenInformationExtractor::class,
-        'IT' => \Reducktion\Socrates\Core\Italy\ItalyCitizenInformationExtractor::class,
-        'LT' => \Reducktion\Socrates\Core\Lithuania\LithuaniaCitizenInformationExtractor::class,
-        'LU' => \Reducktion\Socrates\Core\Luxembourg\LuxembourgCitizenInformationExtractor::class,
-        'LV' => \Reducktion\Socrates\Core\Latvia\LatviaCitizenInformationExtractor::class,
-        'ME' => \Reducktion\Socrates\Core\Montenegro\MontenegroCitizenInformationExtractor::class,
-        'MK' => \Reducktion\Socrates\Core\NorthMacedonia\NorthMacedoniaCitizenInformationExtractor::class,
-        'NO' => \Reducktion\Socrates\Core\Norway\NorwayCitizenInformationExtractor::class,
-        'PL' => \Reducktion\Socrates\Core\Poland\PolandCitizenInformationExtractor::class,
-        'RO' => \Reducktion\Socrates\Core\Romania\RomaniaCitizenInformationExtractor::class,
-        'RS' => \Reducktion\Socrates\Core\Serbia\SerbiaCitizenInformationExtractor::class,
-        'SE' => \Reducktion\Socrates\Core\Sweden\SwedenCitizenInformationExtractor::class,
-        'SI' => \Reducktion\Socrates\Core\Slovenia\SloveniaCitizenInformationExtractor::class,
-        'SK' => \Reducktion\Socrates\Core\Slovakia\SlovakiaCitizenInformationExtractor::class,
-        'UA' => \Reducktion\Socrates\Core\Ukraine\UkraineCitizenInformationExtractor::class,
-        'XK' => \Reducktion\Socrates\Core\Kosovo\KosovoCitizenInformationExtractor::class,
+        /**
+         * Extractors for european countries.
+         */
+        'AL' => \Reducktion\Socrates\Core\Europe\Albania\AlbaniaCitizenInformationExtractor::class,
+        'BA' => \Reducktion\Socrates\Core\Europe\BosniaAndHerzegovina\BosniaAndHerzegovinaCitizenInformationExtractor::class,
+        'BE' => \Reducktion\Socrates\Core\Europe\Belgium\BelgiumCitizenInformationExtractor::class,
+        'BG' => \Reducktion\Socrates\Core\Europe\Bulgaria\BulgariaCitizenInformationExtractor::class,
+        'DK' => \Reducktion\Socrates\Core\Europe\Denmark\DenmarkCitizenInformationExtractor::class,
+        'CZ' => \Reducktion\Socrates\Core\Europe\CzechRepublic\CzechRepublicCitizenInformationExtractor::class,
+        'EE' => \Reducktion\Socrates\Core\Europe\Estonia\EstoniaCitizenInformationExtractor::class,
+        'FI' => \Reducktion\Socrates\Core\Europe\Finland\FinlandCitizenInformationExtractor::class,
+        'FR' => \Reducktion\Socrates\Core\Europe\France\FranceCitizenInformationExtractor::class,
+        'HR' => \Reducktion\Socrates\Core\Europe\Croatia\CroatiaCitizenInformationExtractor::class,
+        'HU' => \Reducktion\Socrates\Core\Europe\Hungary\HungaryCitizenInformationExtractor::class,
+        'IS' => \Reducktion\Socrates\Core\Europe\Iceland\IcelandCitizenInformationExtractor::class,
+        'IT' => \Reducktion\Socrates\Core\Europe\Italy\ItalyCitizenInformationExtractor::class,
+        'LT' => \Reducktion\Socrates\Core\Europe\Lithuania\LithuaniaCitizenInformationExtractor::class,
+        'LV' => \Reducktion\Socrates\Core\Europe\Latvia\LatviaCitizenInformationExtractor::class,
+        'ME' => \Reducktion\Socrates\Core\Europe\Montenegro\MontenegroCitizenInformationExtractor::class,
+        'MK' => \Reducktion\Socrates\Core\Europe\NorthMacedonia\NorthMacedoniaCitizenInformationExtractor::class,
+        'NO' => \Reducktion\Socrates\Core\Europe\Norway\NorwayCitizenInformationExtractor::class,
+        'PL' => \Reducktion\Socrates\Core\Europe\Poland\PolandCitizenInformationExtractor::class,
+        'RO' => \Reducktion\Socrates\Core\Europe\Romania\RomaniaCitizenInformationExtractor::class,
+        'RS' => \Reducktion\Socrates\Core\Europe\Serbia\SerbiaCitizenInformationExtractor::class,
+        'SE' => \Reducktion\Socrates\Core\Europe\Sweden\SwedenCitizenInformationExtractor::class,
+        'SI' => \Reducktion\Socrates\Core\Europe\Slovenia\SloveniaCitizenInformationExtractor::class,
+        'SK' => \Reducktion\Socrates\Core\Europe\Slovakia\SlovakiaCitizenInformationExtractor::class,
+        'UA' => \Reducktion\Socrates\Core\Europe\Ukraine\UkraineCitizenInformationExtractor::class,
+        'XK' => \Reducktion\Socrates\Core\Europe\Kosovo\KosovoCitizenInformationExtractor::class,
+
+        /**
+         * Extractors for north american countries.
+         */
+        'MX' => \Reducktion\Socrates\Core\NorthAmerica\Mexico\MexicoCitizenInformationExtractor::class,
     ];
 }
diff --git a/src/Constants/Country.php b/src/Constants/Country.php
new file mode 100644
index 0000000..27b6d91
--- /dev/null
+++ b/src/Constants/Country.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Reducktion\Socrates\Constants;
+
+/**
+ * Class Country
+ *
+ * Contains the country codes based on ISO 3166-1 alpha-2 codes: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2.
+ *
+ * @package Reducktion\Socrates\Constants
+ */
+abstract class Country
+{
+    /**
+     * European countries
+     */
+    public const ALBANIA = 'AL';
+    public const BELGIUM = 'BE';
+    public const BOSNIA_HERZEGOVINA = 'BA';
+    public const BULGARIA = 'BG';
+    public const CROATIA = 'HR';
+    public const CZECH_REPUBLIC = 'CZ';
+    public const DENMARK = 'DK';
+    public const ESTONIA = 'EE';
+    public const FINLAND = 'FI';
+    public const FRANCE = 'FR';
+    public const GERMANY = 'DE';
+    public const GREECE = 'GR';
+    public const HUNGARY = 'HU';
+    public const ICELAND = 'IS';
+    public const IRELAND = 'IE';
+    public const ITALY = 'IT';
+    public const KOSOVO = 'XK';
+    public const LATVIA = 'LV';
+    public const LITHUANIA = 'LT';
+    public const LUXEMBOURG = 'LU';
+    public const MOLDOVA = 'MD';
+    public const MONTENEGRO = 'ME';
+    public const NETHERLANDS = 'NL';
+    public const NORTH_MACEDONIA = 'MK';
+    public const NORWAY = 'NO';
+    public const POLAND = 'PL';
+    public const PORTUGAL = 'PT';
+    public const ROMANIA = 'RO';
+    public const SERBIA = 'RS';
+    public const SLOVAKIA = 'SK';
+    public const SLOVENIA = 'SI';
+    public const SPAIN = 'ES';
+    public const SWEDEN = 'SE';
+    public const SWITZERLAND = 'CH';
+    public const TURKEY = 'TR';
+    public const UKRAINE = 'UA';
+    public const UNITED_KINGDOM = 'GB';
+
+    /**
+     * North american countries
+     */
+    public const CANADA = 'CA';
+    public const MEXICO = 'MX';
+    public const UNITED_STATES = 'US';
+
+    /**
+     * South american countries
+     */
+    public const ARGENTINA = 'AR';
+    public const BRAZIL = 'BR';
+    public const CHILE = 'CL';
+    public const ECUADOR = 'EC';
+    public const URUGUAY = 'UY';
+}
diff --git a/src/Constants/Gender.php b/src/Constants/Gender.php
index 4f032a4..f160de1 100644
--- a/src/Constants/Gender.php
+++ b/src/Constants/Gender.php
@@ -2,7 +2,7 @@
 
 namespace Reducktion\Socrates\Constants;
 
-class Gender
+abstract class Gender
 {
     public const MALE = 'Male';
     public const FEMALE = 'Female';
diff --git a/src/Core/Albania/AlbaniaCitizenInformationExtractor.php b/src/Core/Europe/Albania/AlbaniaCitizenInformationExtractor.php
similarity index 92%
rename from src/Core/Albania/AlbaniaCitizenInformationExtractor.php
rename to src/Core/Europe/Albania/AlbaniaCitizenInformationExtractor.php
index 70a6abe..d6fd073 100644
--- a/src/Core/Albania/AlbaniaCitizenInformationExtractor.php
+++ b/src/Core/Europe/Albania/AlbaniaCitizenInformationExtractor.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Albania;
+namespace Reducktion\Socrates\Core\Europe\Albania;
 
-use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Exceptions\InvalidIdException;
 use Reducktion\Socrates\Models\Citizen;
 use Reducktion\Socrates\Constants\Gender;
@@ -41,7 +41,7 @@ private function getGender(string $id): string
         return Gender::FEMALE;
     }
 
-    private function getDateOfBirth(string $id): Carbon
+    private function getDateOfBirth(string $id): DateTime
     {
         $dateDigits = substr($id, 0, 6);
         [$yearCode, $monthDigits, $day] = str_split($dateDigits, 2);
@@ -52,7 +52,7 @@ private function getDateOfBirth(string $id): Carbon
 
         $month = $this->getMonthFromDigits($monthDigits, $this->getGender($id));
 
-        return Carbon::createFromFormat('Y-m-d', "$year-$month-$day");
+        return new DateTime("$year-$month-$day");
     }
 
     private function getYearFromCode(string $yearCode): int
diff --git a/src/Core/Albania/AlbaniaIdValidator.php b/src/Core/Europe/Albania/AlbaniaIdValidator.php
similarity index 86%
rename from src/Core/Albania/AlbaniaIdValidator.php
rename to src/Core/Europe/Albania/AlbaniaIdValidator.php
index 9c643ec..ff00d24 100644
--- a/src/Core/Albania/AlbaniaIdValidator.php
+++ b/src/Core/Europe/Albania/AlbaniaIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Albania;
+namespace Reducktion\Socrates\Core\Europe\Albania;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
@@ -20,7 +20,7 @@ public function validate(string $id): bool
         }
 
         $id = strtoupper($id);
-        $id = str_split($id);
+        $idArray = str_split($id);
 
         $verificationTable = [
             1 => 'A',
@@ -48,11 +48,11 @@ public function validate(string $id): bool
             0 => 'W',
         ];
 
-        $firstLetter = $id[0];
-        $checkLetter = $id[9];
-        $firstLetterNumber = array_search($firstLetter, $verificationTable);
+        $firstLetter = $idArray[0];
+        $checkLetter = $idArray[9];
+        $firstLetterNumber = array_search($firstLetter, $verificationTable, true);
 
-        $eightMiddleDigits = array_slice($id, 1, 8);
+        $eightMiddleDigits = array_slice($idArray, 1, 8);
 
         $sum = array_sum(
             array_map(
diff --git a/src/Core/Belgium/BelgiumCitizenInformationExtractor.php b/src/Core/Europe/Belgium/BelgiumCitizenInformationExtractor.php
similarity index 71%
rename from src/Core/Belgium/BelgiumCitizenInformationExtractor.php
rename to src/Core/Europe/Belgium/BelgiumCitizenInformationExtractor.php
index 802daab..927b55d 100644
--- a/src/Core/Belgium/BelgiumCitizenInformationExtractor.php
+++ b/src/Core/Europe/Belgium/BelgiumCitizenInformationExtractor.php
@@ -1,13 +1,20 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Belgium;
+namespace Reducktion\Socrates\Core\Europe\Belgium;
 
-use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
 use Reducktion\Socrates\Exceptions\InvalidIdException;
 use Reducktion\Socrates\Models\Citizen;
 
+/**
+ * Class BelgiumCitizenInformationExtractor
+ *
+ * Algorithm adapted from: http://www.ibz.rrn.fgov.be/fileadmin/user_upload/nl/rr/instructies/IT-lijst/IT000_Rijksregisternummer.pdf.
+ *
+ * @package Reducktion\Socrates\Core\Belgium
+ */
 class BelgiumCitizenInformationExtractor implements CitizenInformationExtractor
 {
     public function extract(string $id): Citizen
@@ -30,7 +37,7 @@ public function extract(string $id): Citizen
 
     private function sanitize(string $id): string
     {
-        $id = str_replace(['-', '.'], '', $id);
+        $id = str_replace(['-', ' ', '.'], '', $id);
 
         return $id;
     }
@@ -40,14 +47,22 @@ private function getGender(int $id): string
         return (substr($id, 6, 3) % 2) ? Gender::MALE : Gender::FEMALE;
     }
 
-    private function getDateOfBirth(string $id): Carbon
+    private function getDateOfBirth(string $id): DateTime
     {
         $dateDigits = substr($id, 0, 6);
         [$year, $month, $day] = str_split($dateDigits, 2);
 
+        $year = (int) $year;
+        $month = (int) $month;
+        $day = (int) $day;
+
+        // use first day or month if unknown
+        $month = $month === 0 ? 1 : $month;
+        $day = $day === 0 ? 1 : $day;
+
         $year = $this->isAfter2000($id) ? $year + 2000 : $year + 1900;
 
-        return Carbon::createFromFormat('Y-m-d', "$year-$month-$day");
+        return new DateTime("$year-$month-$day");
     }
 
     private function isAfter2000($id): bool
diff --git a/src/Core/Belgium/BelgiumIdValidator.php b/src/Core/Europe/Belgium/BelgiumIdValidator.php
similarity index 65%
rename from src/Core/Belgium/BelgiumIdValidator.php
rename to src/Core/Europe/Belgium/BelgiumIdValidator.php
index 9dea5a1..87461a0 100644
--- a/src/Core/Belgium/BelgiumIdValidator.php
+++ b/src/Core/Europe/Belgium/BelgiumIdValidator.php
@@ -1,17 +1,28 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Belgium;
+namespace Reducktion\Socrates\Core\Europe\Belgium;
 
-use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 
+/**
+ * Class BelgiumIdValidator
+ *
+ * Algorithm adapted from: http://www.ibz.rrn.fgov.be/fileadmin/user_upload/nl/rr/instructies/IT-lijst/IT000_Rijksregisternummer.pdf.
+ *
+ * @package Reducktion\Socrates\Core\Belgium
+ */
 class BelgiumIdValidator implements IdValidator
 {
     public function validate(string $id): bool
     {
         $id = $this->sanitize($id);
 
+        if (! $this->validateSequenceNumber($id)) {
+            return false;
+        }
+
         $checksumFromId = (int) substr($id, -2);
         $after2000 = false;
         $checksum = $this->calculateChecksum($id, $after2000);
@@ -33,7 +44,7 @@ public function validate(string $id): bool
 
     private function sanitize(string $id): string
     {
-        $id = str_replace(['-', '.'], '', $id);
+        $id = str_replace(['-', ' ', '.'], '', $id);
 
         $idLength = strlen($id);
 
@@ -44,6 +55,13 @@ private function sanitize(string $id): string
         return $id;
     }
 
+    private function validateSequenceNumber(string $id): bool
+    {
+        $sequenceNumber = (int) substr($id, 6, 3);
+
+        return $sequenceNumber !== 0 && $sequenceNumber !== 999;
+    }
+
     private function calculateChecksum(string $id, bool $after2000): int
     {
         if ($after2000) {
@@ -60,18 +78,21 @@ private function validDateOfBirth(string $id, bool $after2000): bool
         $dateDigits = substr($id, 0, 6);
         [$year, $month, $day] = str_split($dateDigits, 2);
 
+        $year = (int) $year;
+        $month = (int) $month;
+        $day = (int) $day;
+
+        $month = $month === 0 ? 1 : $month;
+        $day = $day === 0 ? 1 : $day;
+
         if ($month < 1 || $month > 12 || $day < 1 || $day > 31) {
             return false;
         }
 
         $year = $after2000 ? $year + 2000 : $year + 1900;
 
-        $dob = Carbon::createFromFormat('Y-m-d', "$year-$month-$day");
-
-        if ($dob->greaterThan($dob->subYears(12))) {
-            return false;
-        }
+        $dateOfBirth = new DateTime("$year-$month-$day");
 
-        return true;
+        return (new DateTime())->diff($dateOfBirth)->y >= 12;
     }
 }
diff --git a/src/Core/BosniaAndHerzegovina/BosniaAndHerzegovinaCitizenInformationExtractor.php b/src/Core/Europe/BosniaAndHerzegovina/BosniaAndHerzegovinaCitizenInformationExtractor.php
similarity index 84%
rename from src/Core/BosniaAndHerzegovina/BosniaAndHerzegovinaCitizenInformationExtractor.php
rename to src/Core/Europe/BosniaAndHerzegovina/BosniaAndHerzegovinaCitizenInformationExtractor.php
index fe03dca..3a5805c 100644
--- a/src/Core/BosniaAndHerzegovina/BosniaAndHerzegovinaCitizenInformationExtractor.php
+++ b/src/Core/Europe/BosniaAndHerzegovina/BosniaAndHerzegovinaCitizenInformationExtractor.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Reducktion\Socrates\Core\BosniaAndHerzegovina;
+namespace Reducktion\Socrates\Core\Europe\BosniaAndHerzegovina;
 
 use Reducktion\Socrates\Models\Citizen;
 use Reducktion\Socrates\Exceptions\InvalidIdException;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
-use Reducktion\Socrates\Core\Yugoslavia\YugoslaviaCitizenInformationExtractor;
+use Reducktion\Socrates\Core\Europe\Yugoslavia\YugoslaviaCitizenInformationExtractor;
 
 class BosniaAndHerzegovinaCitizenInformationExtractor implements CitizenInformationExtractor
 {
diff --git a/src/Core/BosniaAndHerzegovina/BosniaAndHerzegovinaIdValidator.php b/src/Core/Europe/BosniaAndHerzegovina/BosniaAndHerzegovinaIdValidator.php
similarity index 83%
rename from src/Core/BosniaAndHerzegovina/BosniaAndHerzegovinaIdValidator.php
rename to src/Core/Europe/BosniaAndHerzegovina/BosniaAndHerzegovinaIdValidator.php
index 22f5866..0504f81 100644
--- a/src/Core/BosniaAndHerzegovina/BosniaAndHerzegovinaIdValidator.php
+++ b/src/Core/Europe/BosniaAndHerzegovina/BosniaAndHerzegovinaIdValidator.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Reducktion\Socrates\Core\BosniaAndHerzegovina;
+namespace Reducktion\Socrates\Core\Europe\BosniaAndHerzegovina;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
-use Reducktion\Socrates\Core\Yugoslavia\YugoslaviaIdValidator;
+use Reducktion\Socrates\Core\Europe\Yugoslavia\YugoslaviaIdValidator;
 
 class BosniaAndHerzegovinaIdValidator implements IdValidator
 {
diff --git a/src/Core/Bulgaria/BulgariaCitizenInformationExtractor.php b/src/Core/Europe/Bulgaria/BulgariaCitizenInformationExtractor.php
similarity index 86%
rename from src/Core/Bulgaria/BulgariaCitizenInformationExtractor.php
rename to src/Core/Europe/Bulgaria/BulgariaCitizenInformationExtractor.php
index c147f40..1a34988 100644
--- a/src/Core/Bulgaria/BulgariaCitizenInformationExtractor.php
+++ b/src/Core/Europe/Bulgaria/BulgariaCitizenInformationExtractor.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Bulgaria;
+namespace Reducktion\Socrates\Core\Europe\Bulgaria;
 
-use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Exceptions\InvalidIdException;
 use Reducktion\Socrates\Models\Citizen;
 use Reducktion\Socrates\Constants\Gender;
@@ -31,7 +31,7 @@ private function getGender(string $id): string
         return ($id % 2) ? Gender::MALE : Gender::FEMALE;
     }
 
-    private function getDateOfBirth(string $id): Carbon
+    private function getDateOfBirth(string $id): DateTime
     {
         $dateDigits = substr($id, 0, 6);
         [$twoDigitYear, $month, $day] = str_split($dateDigits, 2);
@@ -46,6 +46,6 @@ private function getDateOfBirth(string $id): Carbon
             $year = 1800 + $twoDigitYear;
         }
 
-        return Carbon::createFromFormat('Y-m-d', "$year-$month-$day");
+        return new DateTime("$year-$month-$day");
     }
 }
diff --git a/src/Core/Bulgaria/BulgariaIdValidator.php b/src/Core/Europe/Bulgaria/BulgariaIdValidator.php
similarity index 94%
rename from src/Core/Bulgaria/BulgariaIdValidator.php
rename to src/Core/Europe/Bulgaria/BulgariaIdValidator.php
index 54b2ffe..5fabac1 100644
--- a/src/Core/Bulgaria/BulgariaIdValidator.php
+++ b/src/Core/Europe/Bulgaria/BulgariaIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Bulgaria;
+namespace Reducktion\Socrates\Core\Europe\Bulgaria;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
diff --git a/src/Core/Croatia/CroatiaCitizenInformationExtractor.php b/src/Core/Europe/Croatia/CroatiaCitizenInformationExtractor.php
similarity index 84%
rename from src/Core/Croatia/CroatiaCitizenInformationExtractor.php
rename to src/Core/Europe/Croatia/CroatiaCitizenInformationExtractor.php
index 6bae9cd..af5e9d6 100644
--- a/src/Core/Croatia/CroatiaCitizenInformationExtractor.php
+++ b/src/Core/Europe/Croatia/CroatiaCitizenInformationExtractor.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Croatia;
+namespace Reducktion\Socrates\Core\Europe\Croatia;
 
 use Reducktion\Socrates\Models\Citizen;
 use Reducktion\Socrates\Exceptions\InvalidIdException;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
-use Reducktion\Socrates\Core\Yugoslavia\YugoslaviaCitizenInformationExtractor;
+use Reducktion\Socrates\Core\Europe\Yugoslavia\YugoslaviaCitizenInformationExtractor;
 
 class CroatiaCitizenInformationExtractor implements CitizenInformationExtractor
 {
diff --git a/src/Core/Croatia/CroatiaIdValidator.php b/src/Core/Europe/Croatia/CroatiaIdValidator.php
similarity index 92%
rename from src/Core/Croatia/CroatiaIdValidator.php
rename to src/Core/Europe/Croatia/CroatiaIdValidator.php
index cc7d4ba..f22c4ef 100644
--- a/src/Core/Croatia/CroatiaIdValidator.php
+++ b/src/Core/Europe/Croatia/CroatiaIdValidator.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Croatia;
+namespace Reducktion\Socrates\Core\Europe\Croatia;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
-use Reducktion\Socrates\Core\Yugoslavia\YugoslaviaIdValidator;
+use Reducktion\Socrates\Core\Europe\Yugoslavia\YugoslaviaIdValidator;
 
 class CroatiaIdValidator implements IdValidator
 {
diff --git a/src/Core/CzechRepublic/CzechRepublicCitizenInformationExtractor.php b/src/Core/Europe/CzechRepublic/CzechRepublicCitizenInformationExtractor.php
similarity index 83%
rename from src/Core/CzechRepublic/CzechRepublicCitizenInformationExtractor.php
rename to src/Core/Europe/CzechRepublic/CzechRepublicCitizenInformationExtractor.php
index 17fe9e8..06db012 100644
--- a/src/Core/CzechRepublic/CzechRepublicCitizenInformationExtractor.php
+++ b/src/Core/Europe/CzechRepublic/CzechRepublicCitizenInformationExtractor.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Reducktion\Socrates\Core\CzechRepublic;
+namespace Reducktion\Socrates\Core\Europe\CzechRepublic;
 
 use Reducktion\Socrates\Models\Citizen;
 use Reducktion\Socrates\Exceptions\InvalidIdException;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
-use Reducktion\Socrates\Core\Czechoslovakia\CzechoslovakiaCitizenInformationExtractor;
+use Reducktion\Socrates\Core\Europe\Czechoslovakia\CzechoslovakiaCitizenInformationExtractor;
 
 class CzechRepublicCitizenInformationExtractor implements CitizenInformationExtractor
 {
diff --git a/src/Core/CzechRepublic/CzechRepublicIdValidator.php b/src/Core/Europe/CzechRepublic/CzechRepublicIdValidator.php
similarity index 78%
rename from src/Core/CzechRepublic/CzechRepublicIdValidator.php
rename to src/Core/Europe/CzechRepublic/CzechRepublicIdValidator.php
index 3a2f1b6..042fae2 100644
--- a/src/Core/CzechRepublic/CzechRepublicIdValidator.php
+++ b/src/Core/Europe/CzechRepublic/CzechRepublicIdValidator.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Reducktion\Socrates\Core\CzechRepublic;
+namespace Reducktion\Socrates\Core\Europe\CzechRepublic;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
-use Reducktion\Socrates\Core\Czechoslovakia\CzechoslovakiaIdValidator;
+use Reducktion\Socrates\Core\Europe\Czechoslovakia\CzechoslovakiaIdValidator;
 
 class CzechRepublicIdValidator implements IdValidator
 {
diff --git a/src/Core/Czechoslovakia/CzechoslovakiaCitizenInformationExtractor.php b/src/Core/Europe/Czechoslovakia/CzechoslovakiaCitizenInformationExtractor.php
similarity index 80%
rename from src/Core/Czechoslovakia/CzechoslovakiaCitizenInformationExtractor.php
rename to src/Core/Europe/Czechoslovakia/CzechoslovakiaCitizenInformationExtractor.php
index 94f9a46..5a636ec 100644
--- a/src/Core/Czechoslovakia/CzechoslovakiaCitizenInformationExtractor.php
+++ b/src/Core/Europe/Czechoslovakia/CzechoslovakiaCitizenInformationExtractor.php
@@ -1,12 +1,11 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Czechoslovakia;
+namespace Reducktion\Socrates\Core\Europe\Czechoslovakia;
 
-use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Exceptions\InvalidIdException;
 use Reducktion\Socrates\Models\Citizen;
 use Reducktion\Socrates\Constants\Gender;
-use Reducktion\Socrates\Exceptions\InvalidLengthException;
 
 class CzechoslovakiaCitizenInformationExtractor
 {
@@ -34,7 +33,7 @@ private static function getGender(string $id): string
         return ($monthDigits < 13) ? Gender::MALE : Gender::FEMALE;
     }
 
-    private static function getDateOfBirth(string $id): Carbon
+    private static function getDateOfBirth(string $id): DateTime
     {
         $day = substr($id, 4, 2);
         $month = (int) substr($id, 2, 2);
@@ -44,6 +43,6 @@ private static function getDateOfBirth(string $id): Carbon
 
         $month = $month > 12 ? $month - 50 : $month;
 
-        return Carbon::createFromFormat('Y-m-d', "$year-$month-$day");
+        return new DateTime("$year-$month-$day");
     }
 }
diff --git a/src/Core/Czechoslovakia/CzechoslovakiaIdValidator.php b/src/Core/Europe/Czechoslovakia/CzechoslovakiaIdValidator.php
similarity index 90%
rename from src/Core/Czechoslovakia/CzechoslovakiaIdValidator.php
rename to src/Core/Europe/Czechoslovakia/CzechoslovakiaIdValidator.php
index e5af59b..3970551 100644
--- a/src/Core/Czechoslovakia/CzechoslovakiaIdValidator.php
+++ b/src/Core/Europe/Czechoslovakia/CzechoslovakiaIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Czechoslovakia;
+namespace Reducktion\Socrates\Core\Europe\Czechoslovakia;
 
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 
diff --git a/src/Core/Denmark/DenmarkCitizenInformationExtractor.php b/src/Core/Europe/Denmark/DenmarkCitizenInformationExtractor.php
similarity index 80%
rename from src/Core/Denmark/DenmarkCitizenInformationExtractor.php
rename to src/Core/Europe/Denmark/DenmarkCitizenInformationExtractor.php
index ef41aa8..8430f37 100644
--- a/src/Core/Denmark/DenmarkCitizenInformationExtractor.php
+++ b/src/Core/Europe/Denmark/DenmarkCitizenInformationExtractor.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Denmark;
+namespace Reducktion\Socrates\Core\Europe\Denmark;
 
-use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
 use Reducktion\Socrates\Exceptions\InvalidIdException;
@@ -40,15 +40,15 @@ private function getGender(int $cpr): string
         return ($cpr % 2) ? Gender::MALE : Gender::FEMALE;
     }
 
-    private function getDateOfBirth(string $cpr): Carbon
+    private function getDateOfBirth(string $cpr): DateTime
     {
         $seventhDigit = (int) $cpr[6];
         $dateDigits = substr($cpr, 0, 6);
         [$day, $month, $twoDigitYear] = str_split($dateDigits, 2);
 
         $year = $twoDigitYear < 70
-            ? Carbon::createFromFormat('Y', "19$twoDigitYear")->format('Y')
-            : Carbon::createFromFormat('y', (string) $twoDigitYear)->format('Y');
+            ? DateTime::createFromFormat('Y', "19$twoDigitYear")->format('Y')
+            : DateTime::createFromFormat('y', (string) $twoDigitYear)->format('Y');
 
         if (($seventhDigit === 4 || $seventhDigit === 9) && $year <= 1936) {
             $year += 100;
@@ -56,6 +56,6 @@ private function getDateOfBirth(string $cpr): Carbon
             $year > 1957 ? $year -= 100 : $year += 100;
         }
 
-        return Carbon::createFromFormat('Y-m-d', "$year-$month-$day");
+        return new DateTime("$year-$month-$day");
     }
 }
diff --git a/src/Core/Denmark/DenmarkIdValidator.php b/src/Core/Europe/Denmark/DenmarkIdValidator.php
similarity index 95%
rename from src/Core/Denmark/DenmarkIdValidator.php
rename to src/Core/Europe/Denmark/DenmarkIdValidator.php
index 68d125e..48aa328 100644
--- a/src/Core/Denmark/DenmarkIdValidator.php
+++ b/src/Core/Europe/Denmark/DenmarkIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Denmark;
+namespace Reducktion\Socrates\Core\Europe\Denmark;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
diff --git a/src/Core/Estonia/EstoniaCitizenInformationExtractor.php b/src/Core/Europe/Estonia/EstoniaCitizenInformationExtractor.php
similarity index 85%
rename from src/Core/Estonia/EstoniaCitizenInformationExtractor.php
rename to src/Core/Europe/Estonia/EstoniaCitizenInformationExtractor.php
index 84490cc..b3ecb5c 100644
--- a/src/Core/Estonia/EstoniaCitizenInformationExtractor.php
+++ b/src/Core/Europe/Estonia/EstoniaCitizenInformationExtractor.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Estonia;
+namespace Reducktion\Socrates\Core\Europe\Estonia;
 
-use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
 use Reducktion\Socrates\Exceptions\InvalidIdException;
@@ -31,7 +31,7 @@ private function getGender(string $id): string
         return ($id[0] % 2) ? Gender::MALE : Gender::FEMALE;
     }
 
-    private function getDateOfBirth(string $id): Carbon
+    private function getDateOfBirth(string $id): DateTime
     {
         $dateDigits = substr($id, 1, 6);
         [$year, $month, $day] = str_split($dateDigits, 2);
@@ -48,6 +48,6 @@ private function getDateOfBirth(string $id): Carbon
             $year += 2000;
         }
 
-        return Carbon::createFromFormat('Y-m-d', "$year-$month-$day");
+        return new DateTime("$year-$month-$day");
     }
 }
diff --git a/src/Core/Estonia/EstoniaIdValidator.php b/src/Core/Europe/Estonia/EstoniaIdValidator.php
similarity index 96%
rename from src/Core/Estonia/EstoniaIdValidator.php
rename to src/Core/Europe/Estonia/EstoniaIdValidator.php
index ef78668..2cad0df 100644
--- a/src/Core/Estonia/EstoniaIdValidator.php
+++ b/src/Core/Europe/Estonia/EstoniaIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Estonia;
+namespace Reducktion\Socrates\Core\Europe\Estonia;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
diff --git a/src/Core/Finland/FinlandCitizenInformationExtractor.php b/src/Core/Europe/Finland/FinlandCitizenInformationExtractor.php
similarity index 85%
rename from src/Core/Finland/FinlandCitizenInformationExtractor.php
rename to src/Core/Europe/Finland/FinlandCitizenInformationExtractor.php
index 1e66689..0e254c8 100644
--- a/src/Core/Finland/FinlandCitizenInformationExtractor.php
+++ b/src/Core/Europe/Finland/FinlandCitizenInformationExtractor.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Finland;
+namespace Reducktion\Socrates\Core\Europe\Finland;
 
-use Carbon\Carbon;
+use DateTime;
 use InvalidArgumentException;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
@@ -32,12 +32,12 @@ private function getGender(string $id): string
         return (substr($id, 7, 3) % 2) ? Gender::MALE : Gender::FEMALE;
     }
 
-    private function getDateOfBirth(string $id): Carbon
+    private function getDateOfBirth(string $id): DateTime
     {
         $dateDigits = substr($id, 0, 6);
         [$day, $month, $year] = str_split($dateDigits, 2);
 
-        $century = substr($id, 6, 1);
+        $century = $id[6];
 
         switch ($century) {
             case '+':
@@ -53,6 +53,6 @@ private function getDateOfBirth(string $id): Carbon
                 throw new InvalidArgumentException("Unrecognised character $century in ID.");
         }
 
-        return Carbon::createFromFormat('Y-m-d', "$year-$month-$day");
+        return new DateTime("$year-$month-$day");
     }
 }
diff --git a/src/Core/Finland/FinlandIdValidator.php b/src/Core/Europe/Finland/FinlandIdValidator.php
similarity index 80%
rename from src/Core/Finland/FinlandIdValidator.php
rename to src/Core/Europe/Finland/FinlandIdValidator.php
index 40dbc32..54bf11f 100644
--- a/src/Core/Finland/FinlandIdValidator.php
+++ b/src/Core/Europe/Finland/FinlandIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Finland;
+namespace Reducktion\Socrates\Core\Europe\Finland;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
@@ -16,9 +16,9 @@ public function validate(string $id): bool
 
         $control = substr($id, -1);
         $id = substr($id, 0, -1);
-        $id = substr_replace($id, '', 6, 1);
+        $idArray = substr_replace($id, '', 6, 1);
 
-        $result = ((int) $id % 31);
+        $result = ((int) $idArray % 31);
 
         $controlCharacters = '0123456789ABCDEFHJKLMNPRSTUVWXY';
 
diff --git a/src/Core/France/FranceCitizenInformationExtractor.php b/src/Core/Europe/France/FranceCitizenInformationExtractor.php
similarity index 84%
rename from src/Core/France/FranceCitizenInformationExtractor.php
rename to src/Core/Europe/France/FranceCitizenInformationExtractor.php
index 37958ee..cbb29ef 100644
--- a/src/Core/France/FranceCitizenInformationExtractor.php
+++ b/src/Core/Europe/France/FranceCitizenInformationExtractor.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Reducktion\Socrates\Core\France;
+namespace Reducktion\Socrates\Core\Europe\France;
 
-use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
 use Reducktion\Socrates\Exceptions\InvalidIdException;
@@ -43,24 +43,25 @@ private function getGender(string $id): string
         return ((int) $id[0]) === 1 ? Gender::MALE : Gender::FEMALE;
     }
 
-    private function getDateOfBirth(string $id): Carbon
+    private function getDateOfBirth(string $id): DateTime
     {
         $dateDigits = substr($id, 1, 4);
         [$year, $month] = str_split($dateDigits, 2);
-        $currentYear = now()->format('y');
+        $currentYear = (int) (new DateTime())->format('y');
+
 
         $year = $year > $currentYear ? $year + 1900 : $year + 2000;
 
         if ($month > 0 && $month < 13) {
-            return Carbon::createFromFormat('Y-m', "$year-$month");
+            return DateTime::createFromFormat('Y-m', "$year-$month");
         }
 
         if ($month > 30 && $month < 43) {
             $month -= 30;
-            return Carbon::createFromFormat('Y-m', "$year-$month");
+            return DateTime::createFromFormat('Y-m', "$year-$month");
         }
 
-        return Carbon::createFromFormat('Y', $year);
+        return DateTime::createFromFormat('Y', $year);
     }
 
     private function getPlaceOfBirth(string $id): string
diff --git a/src/Core/France/FranceIdValidator.php b/src/Core/Europe/France/FranceIdValidator.php
similarity index 94%
rename from src/Core/France/FranceIdValidator.php
rename to src/Core/Europe/France/FranceIdValidator.php
index 27b5f92..5298474 100644
--- a/src/Core/France/FranceIdValidator.php
+++ b/src/Core/Europe/France/FranceIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\France;
+namespace Reducktion\Socrates\Core\Europe\France;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
diff --git a/src/Core/France/FranceRegionsList.php b/src/Core/Europe/France/FranceRegionsList.php
similarity index 98%
rename from src/Core/France/FranceRegionsList.php
rename to src/Core/Europe/France/FranceRegionsList.php
index 4dd9e24..c9d7be4 100644
--- a/src/Core/France/FranceRegionsList.php
+++ b/src/Core/Europe/France/FranceRegionsList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\France;
+namespace Reducktion\Socrates\Core\Europe\France;
 
 class FranceRegionsList
 {
diff --git a/src/Core/Europe/Germany/GermanIdValidator.php b/src/Core/Europe/Germany/GermanIdValidator.php
new file mode 100644
index 0000000..319d03f
--- /dev/null
+++ b/src/Core/Europe/Germany/GermanIdValidator.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Reducktion\Socrates\Core\Europe\Germany;
+
+use Reducktion\Socrates\Contracts\IdValidator;
+use Reducktion\Socrates\Exceptions\InvalidLengthException;
+
+//Documentation can be found in Chapter 2.2 https://download.elster.de/download/schnittstellen/Pruefung_der_Steuer_und_Steueridentifikatsnummer.pdf
+class GermanIdValidator implements IdValidator
+{
+    public function validate(string $id): bool
+    {
+        $idLength = strlen($id);
+        if ($idLength !== 11) {
+            throw new InvalidLengthException('German TIN', '11', $idLength);
+        }
+
+        // German TIN must not start with a '0'
+        if ((int) $id[0] === 0) {
+            return false;
+        }
+
+        // The first 10 numbers of the German TIN need to have 8 or 9 different numbers
+        $digits = str_split($id);
+        array_pop($digits);
+        $countDigits = count(array_unique($digits));
+
+        if (($countDigits !== 9 && $countDigits !== 8)) {
+            return false;
+        }
+
+        // Checksum calculation
+        $product = 10;
+        for ($i = 0; $i <= 9; ++$i) {
+            $sum = ((int) $id[$i] + $product) % 10;
+            if ($sum === 0) {
+                $sum = 10;
+            }
+            $product = ($sum * 2) % 11;
+        }
+
+        $checksum = 11 - $product;
+        if ($checksum === 10) {
+            $checksum = 0;
+        }
+
+        return $checksum === (int) $id[strlen($id) - 1];
+    }
+}
diff --git a/src/Core/Greece/GreeceIdValidator.php b/src/Core/Europe/Greece/GreeceIdValidator.php
similarity index 95%
rename from src/Core/Greece/GreeceIdValidator.php
rename to src/Core/Europe/Greece/GreeceIdValidator.php
index 8b96a81..ac91913 100644
--- a/src/Core/Greece/GreeceIdValidator.php
+++ b/src/Core/Europe/Greece/GreeceIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Greece;
+namespace Reducktion\Socrates\Core\Europe\Greece;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
diff --git a/src/Core/Hungary/HungaryCitizenInformationExtractor.php b/src/Core/Europe/Hungary/HungaryCitizenInformationExtractor.php
similarity index 86%
rename from src/Core/Hungary/HungaryCitizenInformationExtractor.php
rename to src/Core/Europe/Hungary/HungaryCitizenInformationExtractor.php
index 5546e56..22ceba7 100644
--- a/src/Core/Hungary/HungaryCitizenInformationExtractor.php
+++ b/src/Core/Europe/Hungary/HungaryCitizenInformationExtractor.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Hungary;
+namespace Reducktion\Socrates\Core\Europe\Hungary;
 
-use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Models\Citizen;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Exceptions\InvalidIdException;
@@ -35,7 +35,7 @@ private function getGender(string $id): string
         return ($id[0] % 2) ? Gender::MALE : Gender::FEMALE;
     }
 
-    private function getDateOfBirth(string $id): Carbon
+    private function getDateOfBirth(string $id): DateTime
     {
         $dateDigits = substr($id, 1, 6);
         [$twoDigitYear, $month, $day] = str_split($dateDigits, 2);
@@ -46,6 +46,6 @@ private function getDateOfBirth(string $id): Carbon
             $year = 1900 + $twoDigitYear;
         }
 
-        return Carbon::createFromFormat('Y-m-d', "$year-$month-$day");
+        return new DateTime("$year-$month-$day");
     }
 }
diff --git a/src/Core/Hungary/HungaryIdValidator.php b/src/Core/Europe/Hungary/HungaryIdValidator.php
similarity index 97%
rename from src/Core/Hungary/HungaryIdValidator.php
rename to src/Core/Europe/Hungary/HungaryIdValidator.php
index 1797de1..cfb813b 100644
--- a/src/Core/Hungary/HungaryIdValidator.php
+++ b/src/Core/Europe/Hungary/HungaryIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Hungary;
+namespace Reducktion\Socrates\Core\Europe\Hungary;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
diff --git a/src/Core/Iceland/IcelandCitizenInformationExtractor.php b/src/Core/Europe/Iceland/IcelandCitizenInformationExtractor.php
similarity index 81%
rename from src/Core/Iceland/IcelandCitizenInformationExtractor.php
rename to src/Core/Europe/Iceland/IcelandCitizenInformationExtractor.php
index ebe61d9..a00a075 100644
--- a/src/Core/Iceland/IcelandCitizenInformationExtractor.php
+++ b/src/Core/Europe/Iceland/IcelandCitizenInformationExtractor.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Iceland;
+namespace Reducktion\Socrates\Core\Europe\Iceland;
 
-use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
 use Reducktion\Socrates\Exceptions\InvalidIdException;
 use Reducktion\Socrates\Models\Citizen;
@@ -32,9 +32,9 @@ private function sanitize(string $id): string
         return $id;
     }
 
-    private function getDateOfBirth(string $id): Carbon
+    private function getDateOfBirth(string $id): DateTime
     {
-        $centuryCheck = substr($id, 9, 1);
+        $centuryCheck = $id[9];
         $dateDigits = substr($id, 0, 6);
         [$day, $month, $twoDigitYear] = str_split($dateDigits, 2);
 
@@ -44,6 +44,6 @@ private function getDateOfBirth(string $id): Carbon
 
         $year = $centuryCheck === '0' ? 20 . $twoDigitYear : 19 . $twoDigitYear;
 
-        return Carbon::createFromFormat('Y-m-d', "$year-$month-$day");
+        return new DateTime("$year-$month-$day");
     }
 }
diff --git a/src/Core/Iceland/IcelandIdValidator.php b/src/Core/Europe/Iceland/IcelandIdValidator.php
similarity index 91%
rename from src/Core/Iceland/IcelandIdValidator.php
rename to src/Core/Europe/Iceland/IcelandIdValidator.php
index 4a60ffb..3acf227 100644
--- a/src/Core/Iceland/IcelandIdValidator.php
+++ b/src/Core/Europe/Iceland/IcelandIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Iceland;
+namespace Reducktion\Socrates\Core\Europe\Iceland;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
@@ -26,7 +26,7 @@ static function ($digit) {
         }
 
         $remainder = 11 - ($sum % 11);
-        $secretNumber = intval(substr($id, 8, 1), 0);
+        $secretNumber = intval($id[8], 0);
 
         return ($remainder === 11 && $secretNumber === 0) || $remainder === $secretNumber;
     }
diff --git a/src/Core/Ireland/IrelandIdValidator.php b/src/Core/Europe/Ireland/IrelandIdValidator.php
similarity index 96%
rename from src/Core/Ireland/IrelandIdValidator.php
rename to src/Core/Europe/Ireland/IrelandIdValidator.php
index 2b5a086..399a2c9 100644
--- a/src/Core/Ireland/IrelandIdValidator.php
+++ b/src/Core/Europe/Ireland/IrelandIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Ireland;
+namespace Reducktion\Socrates\Core\Europe\Ireland;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
diff --git a/src/Core/Italy/ItalyCitizenInformationExtractor.php b/src/Core/Europe/Italy/ItalyCitizenInformationExtractor.php
similarity index 90%
rename from src/Core/Italy/ItalyCitizenInformationExtractor.php
rename to src/Core/Europe/Italy/ItalyCitizenInformationExtractor.php
index e35dbe3..68046b4 100644
--- a/src/Core/Italy/ItalyCitizenInformationExtractor.php
+++ b/src/Core/Europe/Italy/ItalyCitizenInformationExtractor.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Italy;
+namespace Reducktion\Socrates\Core\Europe\Italy;
 
-use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Exceptions\InvalidIdException;
 use Reducktion\Socrates\Exceptions\UnrecognisedPlaceOfBirthException;
 use Reducktion\Socrates\Models\Citizen;
@@ -14,7 +14,7 @@
  *
  * Algorithm adapted from: http://www.dossier.net/utilities/codice-fiscale/decreto1974_2227.html and https://en.wikipedia.org/wiki/Italian_fiscal_code.
  *
- * @package Reducktion\Socrates\Core\Italy
+ * @package Reducktion\Socrates\Core\Europe\Italy
  */
 class ItalyCitizenInformationExtractor implements CitizenInformationExtractor
 {
@@ -44,19 +44,19 @@ private function getGender(string $id): string
         return $dayOfBirth > 31 ? Gender::FEMALE : Gender::MALE;
     }
 
-    private function getDateOfBirth(string $id): Carbon
+    private function getDateOfBirth(string $id): DateTime
     {
         $dayDigits = substr($id, 9, 2);
         $monthChar = $id[8];
         $yearDigits = substr($id, 6, 2);
         $months = 'ABCDEHLMPRST';
-        $currentYear = (int) now()->format('y');
+        $currentYear = (int) (new DateTime())->format('y');
 
         $day = (int) $dayDigits > 31 ? (int) $dayDigits - 40 : (int) $dayDigits;
         $month = strpos($months, $monthChar) + 1;
         $year = (int) $yearDigits > $currentYear ? (int) $yearDigits + 1900 : (int) $yearDigits + 2000;
 
-        return Carbon::createFromFormat('Y-m-d', "$year-$month-$day");
+        return new DateTime("$year-$month-$day");
     }
 
     private function getPlaceOfBirth(string $id): string
diff --git a/src/Core/Italy/ItalyIdValidator.php b/src/Core/Europe/Italy/ItalyIdValidator.php
similarity index 96%
rename from src/Core/Italy/ItalyIdValidator.php
rename to src/Core/Europe/Italy/ItalyIdValidator.php
index 6e28a6a..4861503 100644
--- a/src/Core/Italy/ItalyIdValidator.php
+++ b/src/Core/Europe/Italy/ItalyIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Italy;
+namespace Reducktion\Socrates\Core\Europe\Italy;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
@@ -10,7 +10,7 @@
  *
  * Algorithm adapted from: http://www.dossier.net/utilities/codice-fiscale/decreto1974_2227.html and https://en.wikipedia.org/wiki/Italian_fiscal_code.
  *
- * @package Reducktion\Socrates\Core\Italy
+ * @package Reducktion\Socrates\Core\Europe\Italy
  */
 class ItalyIdValidator implements IdValidator
 {
diff --git a/src/Core/Italy/ItalyRegionsList.php b/src/Core/Europe/Italy/ItalyRegionsList.php
similarity index 99%
rename from src/Core/Italy/ItalyRegionsList.php
rename to src/Core/Europe/Italy/ItalyRegionsList.php
index 9a259dd..a6f530a 100644
--- a/src/Core/Italy/ItalyRegionsList.php
+++ b/src/Core/Europe/Italy/ItalyRegionsList.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Italy;
+namespace Reducktion\Socrates\Core\Europe\Italy;
 
 /**
  * Class ItalyRegionsList
  *
  * Data taken from: https://web.archive.org/web/20160819012136/http://www.agenziaentrate.gov.it/wps/wcm/connect/321b0500426a5e2492629bc065cef0e8/codicicatastali_comuni_29_11_2010.pdf?MOD=AJPERES&CACHEID=321b500426a5e2492629bc065cef0e8
  *
- * @package Reducktion\Socrates\Core\Italy
+ * @package Reducktion\Socrates\Core\Europe\Italy
  */
 class ItalyRegionsList
 {
diff --git a/src/Core/Kosovo/KosovoCitizenInformationExtractor.php b/src/Core/Europe/Kosovo/KosovoCitizenInformationExtractor.php
similarity index 85%
rename from src/Core/Kosovo/KosovoCitizenInformationExtractor.php
rename to src/Core/Europe/Kosovo/KosovoCitizenInformationExtractor.php
index 2799829..bc0afbc 100644
--- a/src/Core/Kosovo/KosovoCitizenInformationExtractor.php
+++ b/src/Core/Europe/Kosovo/KosovoCitizenInformationExtractor.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Kosovo;
+namespace Reducktion\Socrates\Core\Europe\Kosovo;
 
 use Reducktion\Socrates\Exceptions\InvalidIdException;
 use Reducktion\Socrates\Models\Citizen;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
-use Reducktion\Socrates\Core\Yugoslavia\YugoslaviaCitizenInformationExtractor;
+use Reducktion\Socrates\Core\Europe\Yugoslavia\YugoslaviaCitizenInformationExtractor;
 
 class KosovoCitizenInformationExtractor implements CitizenInformationExtractor
 {
diff --git a/src/Core/Kosovo/KosovoIdValidator.php b/src/Core/Europe/Kosovo/KosovoIdValidator.php
similarity index 84%
rename from src/Core/Kosovo/KosovoIdValidator.php
rename to src/Core/Europe/Kosovo/KosovoIdValidator.php
index c1d3194..b9d1e3f 100644
--- a/src/Core/Kosovo/KosovoIdValidator.php
+++ b/src/Core/Europe/Kosovo/KosovoIdValidator.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Kosovo;
+namespace Reducktion\Socrates\Core\Europe\Kosovo;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
-use Reducktion\Socrates\Core\Yugoslavia\YugoslaviaIdValidator;
+use Reducktion\Socrates\Core\Europe\Yugoslavia\YugoslaviaIdValidator;
 
 class KosovoIdValidator implements IdValidator
 {
diff --git a/src/Core/Latvia/LatviaCitizenInformationExtractor.php b/src/Core/Europe/Latvia/LatviaCitizenInformationExtractor.php
similarity index 85%
rename from src/Core/Latvia/LatviaCitizenInformationExtractor.php
rename to src/Core/Europe/Latvia/LatviaCitizenInformationExtractor.php
index fc30b2b..f402376 100644
--- a/src/Core/Latvia/LatviaCitizenInformationExtractor.php
+++ b/src/Core/Europe/Latvia/LatviaCitizenInformationExtractor.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Latvia;
+namespace Reducktion\Socrates\Core\Europe\Latvia;
 
-use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Exceptions\InvalidIdException;
 use Reducktion\Socrates\Models\Citizen;
 use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
@@ -20,7 +20,7 @@ public function extract(string $id): Citizen
 
         $citizen = new Citizen();
 
-        if (substr($id, 0, 2) === '32') {
+        if (strpos($id, '32') === 0) {
             throw new UnsupportedOperationException(
                 'Latvia does not support citizen information extraction for PK issued after July 2017.'
             );
@@ -40,7 +40,7 @@ private function sanitize(string $id): string
         return $id;
     }
 
-    private function getDateOfBirth(string $id): Carbon
+    private function getDateOfBirth(string $id): DateTime
     {
         $dateDigits = substr($id, 0, 6);
         [$day, $month, $year] = str_split($dateDigits, 2);
@@ -58,6 +58,6 @@ private function getDateOfBirth(string $id): Carbon
             $year += 2000;
         }
 
-        return Carbon::createFromFormat('Y-m-d', "$year-$month-$day");
+        return new DateTime("$year-$month-$day");
     }
 }
diff --git a/src/Core/Latvia/LatviaIdValidator.php b/src/Core/Europe/Latvia/LatviaIdValidator.php
similarity index 96%
rename from src/Core/Latvia/LatviaIdValidator.php
rename to src/Core/Europe/Latvia/LatviaIdValidator.php
index 8a1049b..d933dce 100644
--- a/src/Core/Latvia/LatviaIdValidator.php
+++ b/src/Core/Europe/Latvia/LatviaIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Latvia;
+namespace Reducktion\Socrates\Core\Europe\Latvia;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
diff --git a/src/Core/Lithuania/LithuaniaCitizenInformationExtractor.php b/src/Core/Europe/Lithuania/LithuaniaCitizenInformationExtractor.php
similarity index 86%
rename from src/Core/Lithuania/LithuaniaCitizenInformationExtractor.php
rename to src/Core/Europe/Lithuania/LithuaniaCitizenInformationExtractor.php
index 3e57a33..a778c9f 100644
--- a/src/Core/Lithuania/LithuaniaCitizenInformationExtractor.php
+++ b/src/Core/Europe/Lithuania/LithuaniaCitizenInformationExtractor.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Lithuania;
+namespace Reducktion\Socrates\Core\Europe\Lithuania;
 
-use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
 use Reducktion\Socrates\Exceptions\InvalidIdException;
@@ -31,7 +31,7 @@ private function getGender(string $id): string
         return ($id[0] % 2) ? Gender::MALE : Gender::FEMALE;
     }
 
-    private function getDateOfBirth(string $id): Carbon
+    private function getDateOfBirth(string $id): DateTime
     {
         $dateDigits = substr($id, 1, 6);
         [$year, $month, $day] = str_split($dateDigits, 2);
@@ -45,6 +45,6 @@ private function getDateOfBirth(string $id): Carbon
 
         $year = (($century - 1) * 100) + $year;
 
-        return Carbon::createFromFormat('Y-m-d', "$year-$month-$day");
+        return new DateTime("$year-$month-$day");
     }
 }
diff --git a/src/Core/Lithuania/LithuaniaIdValidator.php b/src/Core/Europe/Lithuania/LithuaniaIdValidator.php
similarity index 95%
rename from src/Core/Lithuania/LithuaniaIdValidator.php
rename to src/Core/Europe/Lithuania/LithuaniaIdValidator.php
index a0c19a3..1b927df 100644
--- a/src/Core/Lithuania/LithuaniaIdValidator.php
+++ b/src/Core/Europe/Lithuania/LithuaniaIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Lithuania;
+namespace Reducktion\Socrates\Core\Europe\Lithuania;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
diff --git a/src/Core/Luxembourg/LuxembourgCitizenInformationExtractor.php b/src/Core/Europe/Luxembourg/LuxembourgCitizenInformationExtractor.php
similarity index 78%
rename from src/Core/Luxembourg/LuxembourgCitizenInformationExtractor.php
rename to src/Core/Europe/Luxembourg/LuxembourgCitizenInformationExtractor.php
index f08fa19..730c1c1 100644
--- a/src/Core/Luxembourg/LuxembourgCitizenInformationExtractor.php
+++ b/src/Core/Europe/Luxembourg/LuxembourgCitizenInformationExtractor.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Luxembourg;
+namespace Reducktion\Socrates\Core\Europe\Luxembourg;
 
-use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Models\Citizen;
 use Reducktion\Socrates\Exceptions\InvalidIdException;
 use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
@@ -23,12 +23,12 @@ public function extract(string $id): Citizen
         return $citizen;
     }
 
-    private function getDateOfBirth(string $id): Carbon
+    private function getDateOfBirth(string $id): DateTime
     {
         $year = substr($id, 0, 4);
         $month = substr($id, 4, 2);
         $day = substr($id, 6, 2);
 
-        return Carbon::createFromFormat('Y-m-d', "$year-$month-$day");
+        return new DateTime("$year-$month-$day");
     }
 }
diff --git a/src/Core/Luxembourg/LuxembourgIdValidator.php b/src/Core/Europe/Luxembourg/LuxembourgIdValidator.php
similarity index 97%
rename from src/Core/Luxembourg/LuxembourgIdValidator.php
rename to src/Core/Europe/Luxembourg/LuxembourgIdValidator.php
index 75a1a06..d3799e2 100644
--- a/src/Core/Luxembourg/LuxembourgIdValidator.php
+++ b/src/Core/Europe/Luxembourg/LuxembourgIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Luxembourg;
+namespace Reducktion\Socrates\Core\Europe\Luxembourg;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
diff --git a/src/Core/Moldova/MoldovaIdValidator.php b/src/Core/Europe/Moldova/MoldovaIdValidator.php
similarity index 95%
rename from src/Core/Moldova/MoldovaIdValidator.php
rename to src/Core/Europe/Moldova/MoldovaIdValidator.php
index 25c7952..bb308f6 100644
--- a/src/Core/Moldova/MoldovaIdValidator.php
+++ b/src/Core/Europe/Moldova/MoldovaIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Moldova;
+namespace Reducktion\Socrates\Core\Europe\Moldova;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
diff --git a/src/Core/Montenegro/MontenegroCitizenInformationExtractor.php b/src/Core/Europe/Montenegro/MontenegroCitizenInformationExtractor.php
similarity index 84%
rename from src/Core/Montenegro/MontenegroCitizenInformationExtractor.php
rename to src/Core/Europe/Montenegro/MontenegroCitizenInformationExtractor.php
index b4d4190..818af52 100644
--- a/src/Core/Montenegro/MontenegroCitizenInformationExtractor.php
+++ b/src/Core/Europe/Montenegro/MontenegroCitizenInformationExtractor.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Montenegro;
+namespace Reducktion\Socrates\Core\Europe\Montenegro;
 
 use Reducktion\Socrates\Exceptions\InvalidIdException;
 use Reducktion\Socrates\Models\Citizen;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
-use Reducktion\Socrates\Core\Yugoslavia\YugoslaviaCitizenInformationExtractor;
+use Reducktion\Socrates\Core\Europe\Yugoslavia\YugoslaviaCitizenInformationExtractor;
 
 class MontenegroCitizenInformationExtractor implements CitizenInformationExtractor
 {
diff --git a/src/Core/Montenegro/MontenegroIdValidator.php b/src/Core/Europe/Montenegro/MontenegroIdValidator.php
similarity index 84%
rename from src/Core/Montenegro/MontenegroIdValidator.php
rename to src/Core/Europe/Montenegro/MontenegroIdValidator.php
index 6ade489..0a59dd6 100644
--- a/src/Core/Montenegro/MontenegroIdValidator.php
+++ b/src/Core/Europe/Montenegro/MontenegroIdValidator.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Montenegro;
+namespace Reducktion\Socrates\Core\Europe\Montenegro;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
-use Reducktion\Socrates\Core\Yugoslavia\YugoslaviaIdValidator;
+use Reducktion\Socrates\Core\Europe\Yugoslavia\YugoslaviaIdValidator;
 
 class MontenegroIdValidator implements IdValidator
 {
diff --git a/src/Core/Netherlands/NetherlandsIdValidator.php b/src/Core/Europe/Netherlands/NetherlandsIdValidator.php
similarity index 94%
rename from src/Core/Netherlands/NetherlandsIdValidator.php
rename to src/Core/Europe/Netherlands/NetherlandsIdValidator.php
index 8b6cb4f..220e3a5 100644
--- a/src/Core/Netherlands/NetherlandsIdValidator.php
+++ b/src/Core/Europe/Netherlands/NetherlandsIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Netherlands;
+namespace Reducktion\Socrates\Core\Europe\Netherlands;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
diff --git a/src/Core/NorthMacedonia/NorthMacedoniaCitizenInformationExtractor.php b/src/Core/Europe/NorthMacedonia/NorthMacedoniaCitizenInformationExtractor.php
similarity index 84%
rename from src/Core/NorthMacedonia/NorthMacedoniaCitizenInformationExtractor.php
rename to src/Core/Europe/NorthMacedonia/NorthMacedoniaCitizenInformationExtractor.php
index 1130ae3..d3dcd32 100644
--- a/src/Core/NorthMacedonia/NorthMacedoniaCitizenInformationExtractor.php
+++ b/src/Core/Europe/NorthMacedonia/NorthMacedoniaCitizenInformationExtractor.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Reducktion\Socrates\Core\NorthMacedonia;
+namespace Reducktion\Socrates\Core\Europe\NorthMacedonia;
 
 use Reducktion\Socrates\Exceptions\InvalidIdException;
 use Reducktion\Socrates\Models\Citizen;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
-use Reducktion\Socrates\Core\Yugoslavia\YugoslaviaCitizenInformationExtractor;
+use Reducktion\Socrates\Core\Europe\Yugoslavia\YugoslaviaCitizenInformationExtractor;
 
 class NorthMacedoniaCitizenInformationExtractor implements CitizenInformationExtractor
 {
diff --git a/src/Core/NorthMacedonia/NorthMacedoniaIdValidator.php b/src/Core/Europe/NorthMacedonia/NorthMacedoniaIdValidator.php
similarity index 84%
rename from src/Core/NorthMacedonia/NorthMacedoniaIdValidator.php
rename to src/Core/Europe/NorthMacedonia/NorthMacedoniaIdValidator.php
index b0764a6..00b389c 100644
--- a/src/Core/NorthMacedonia/NorthMacedoniaIdValidator.php
+++ b/src/Core/Europe/NorthMacedonia/NorthMacedoniaIdValidator.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Reducktion\Socrates\Core\NorthMacedonia;
+namespace Reducktion\Socrates\Core\Europe\NorthMacedonia;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
-use Reducktion\Socrates\Core\Yugoslavia\YugoslaviaIdValidator;
+use Reducktion\Socrates\Core\Europe\Yugoslavia\YugoslaviaIdValidator;
 
 class NorthMacedoniaIdValidator implements IdValidator
 {
diff --git a/src/Core/Norway/NorwayCitizenInformationExtractor.php b/src/Core/Europe/Norway/NorwayCitizenInformationExtractor.php
similarity index 88%
rename from src/Core/Norway/NorwayCitizenInformationExtractor.php
rename to src/Core/Europe/Norway/NorwayCitizenInformationExtractor.php
index 5f99a69..a0d43fb 100644
--- a/src/Core/Norway/NorwayCitizenInformationExtractor.php
+++ b/src/Core/Europe/Norway/NorwayCitizenInformationExtractor.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Norway;
+namespace Reducktion\Socrates\Core\Europe\Norway;
 
-use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
 use Reducktion\Socrates\Exceptions\InvalidIdException;
@@ -33,7 +33,7 @@ private function getGender(int $individualNumber): string
         return ($individualNumber % 2) ? Gender::MALE : Gender::FEMALE;
     }
 
-    private function getDateOfBirth(string $id): Carbon
+    private function getDateOfBirth(string $id): DateTime
     {
         $day = (int) substr($id, 0, 2);
         $month = (int) substr($id, 2, 2);
@@ -64,6 +64,6 @@ private function getDateOfBirth(string $id): Carbon
 
         $year = $century + $twoDigitYear;
 
-        return Carbon::createFromFormat('Y-m-d', "$year-$month-$day");
+        return new DateTime("$year-$month-$day");
     }
 }
diff --git a/src/Core/Norway/NorwayIdValidator.php b/src/Core/Europe/Norway/NorwayIdValidator.php
similarity index 97%
rename from src/Core/Norway/NorwayIdValidator.php
rename to src/Core/Europe/Norway/NorwayIdValidator.php
index 42c6032..c06faa8 100644
--- a/src/Core/Norway/NorwayIdValidator.php
+++ b/src/Core/Europe/Norway/NorwayIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Norway;
+namespace Reducktion\Socrates\Core\Europe\Norway;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
diff --git a/src/Core/Poland/PolandCitizenInformationExtractor.php b/src/Core/Europe/Poland/PolandCitizenInformationExtractor.php
similarity index 88%
rename from src/Core/Poland/PolandCitizenInformationExtractor.php
rename to src/Core/Europe/Poland/PolandCitizenInformationExtractor.php
index c9fc643..cfe0090 100644
--- a/src/Core/Poland/PolandCitizenInformationExtractor.php
+++ b/src/Core/Europe/Poland/PolandCitizenInformationExtractor.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Poland;
+namespace Reducktion\Socrates\Core\Europe\Poland;
 
-use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Exceptions\InvalidIdException;
 use Reducktion\Socrates\Models\Citizen;
@@ -31,7 +31,7 @@ private function getGender($id): string
         return ($id[9] % 2) ? Gender::MALE : Gender::FEMALE;
     }
 
-    private function getDateOfBirth($id): Carbon
+    private function getDateOfBirth($id): DateTime
     {
         $dateDigits = substr($id, 0, 6);
         [$year, $month, $day] = str_split($dateDigits, 2);
@@ -60,6 +60,6 @@ private function getDateOfBirth($id): Carbon
             $year += 2200;
         }
 
-        return Carbon::createFromFormat('Y-m-d', "$year-$month-$day");
+        return new DateTime("$year-$month-$day");
     }
 }
diff --git a/src/Core/Poland/PolandIdValidator.php b/src/Core/Europe/Poland/PolandIdValidator.php
similarity index 94%
rename from src/Core/Poland/PolandIdValidator.php
rename to src/Core/Europe/Poland/PolandIdValidator.php
index 878e807..7a83e7e 100644
--- a/src/Core/Poland/PolandIdValidator.php
+++ b/src/Core/Europe/Poland/PolandIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Poland;
+namespace Reducktion\Socrates\Core\Europe\Poland;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
diff --git a/src/Core/Portugal/PortugalIdValidator.php b/src/Core/Europe/Portugal/PortugalIdValidator.php
similarity index 96%
rename from src/Core/Portugal/PortugalIdValidator.php
rename to src/Core/Europe/Portugal/PortugalIdValidator.php
index ac49b9e..f4a66d3 100644
--- a/src/Core/Portugal/PortugalIdValidator.php
+++ b/src/Core/Europe/Portugal/PortugalIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Portugal;
+namespace Reducktion\Socrates\Core\Europe\Portugal;
 
 use InvalidArgumentException;
 use Reducktion\Socrates\Contracts\IdValidator;
@@ -11,7 +11,7 @@
  *
  * Algorithm adapted from: https://www.autenticacao.gov.pt/documents/20126/115760/Valida%C3%A7%C3%A3o+de+N%C3%BAmero+de+Documento+do+Cart%C3%A3o+de+Cidad%C3%A3o.pdf/bdc4eb37-7316-3ff4-164a-f869382b7053.
  *
- * @package Reducktion\Socrates\Core\Portugal
+ * @package Reducktion\Socrates\Core\Europe\Portugal
  */
 class PortugalIdValidator implements IdValidator
 {
diff --git a/src/Core/Romania/RomaniaCitizenInformationExtractor.php b/src/Core/Europe/Romania/RomaniaCitizenInformationExtractor.php
similarity index 92%
rename from src/Core/Romania/RomaniaCitizenInformationExtractor.php
rename to src/Core/Europe/Romania/RomaniaCitizenInformationExtractor.php
index 394c957..ff879a6 100644
--- a/src/Core/Romania/RomaniaCitizenInformationExtractor.php
+++ b/src/Core/Europe/Romania/RomaniaCitizenInformationExtractor.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Romania;
+namespace Reducktion\Socrates\Core\Europe\Romania;
 
-use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
 use Reducktion\Socrates\Exceptions\InvalidIdException;
@@ -34,7 +34,7 @@ private function getGender(string $id): string
         return ((int) substr($id, 0, 1)) % 2 ? Gender::MALE : Gender::FEMALE;
     }
 
-    private function getDateOfBirth(string $id): Carbon
+    private function getDateOfBirth(string $id): DateTime
     {
         $yearCode = ((int) $id[1] * 10) + (int) $id[2];
         switch ((int) $id[0]) {
@@ -71,7 +71,7 @@ private function getDateOfBirth(string $id): Carbon
 
         $day = $id[5] . $id[6];
 
-        return Carbon::createFromFormat('Y-m-d', "$year-$month-$day");
+        return new DateTime("$year-$month-$day");
     }
 
     private function getPlaceOfBirth(string $id): string
diff --git a/src/Core/Romania/RomaniaIdValidator.php b/src/Core/Europe/Romania/RomaniaIdValidator.php
similarity index 74%
rename from src/Core/Romania/RomaniaIdValidator.php
rename to src/Core/Europe/Romania/RomaniaIdValidator.php
index add6bfe..2e31658 100644
--- a/src/Core/Romania/RomaniaIdValidator.php
+++ b/src/Core/Europe/Romania/RomaniaIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Romania;
+namespace Reducktion\Socrates\Core\Europe\Romania;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
@@ -23,10 +23,6 @@ public function validate(string $id): bool
 
         $sum %= 11;
 
-        if (($sum === 10 && $id[12] !== '1') || ($sum < 10 && $sum != $id[12])) {
-            return false;
-        }
-
-        return true;
+        return !(($sum === 10 && $id[12] !== '1') || ($sum < 10 && $sum !== (int) $id[12]));
     }
 }
diff --git a/src/Core/Romania/RomaniaRegionsList.php b/src/Core/Europe/Romania/RomaniaRegionsList.php
similarity index 96%
rename from src/Core/Romania/RomaniaRegionsList.php
rename to src/Core/Europe/Romania/RomaniaRegionsList.php
index c289f33..08a040c 100644
--- a/src/Core/Romania/RomaniaRegionsList.php
+++ b/src/Core/Europe/Romania/RomaniaRegionsList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Romania;
+namespace Reducktion\Socrates\Core\Europe\Romania;
 
 class RomaniaRegionsList
 {
diff --git a/src/Core/Serbia/SerbiaCitizenInformationExtractor.php b/src/Core/Europe/Serbia/SerbiaCitizenInformationExtractor.php
similarity index 85%
rename from src/Core/Serbia/SerbiaCitizenInformationExtractor.php
rename to src/Core/Europe/Serbia/SerbiaCitizenInformationExtractor.php
index eb494ee..9543f98 100644
--- a/src/Core/Serbia/SerbiaCitizenInformationExtractor.php
+++ b/src/Core/Europe/Serbia/SerbiaCitizenInformationExtractor.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Serbia;
+namespace Reducktion\Socrates\Core\Europe\Serbia;
 
 use Reducktion\Socrates\Exceptions\InvalidIdException;
 use Reducktion\Socrates\Models\Citizen;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
-use Reducktion\Socrates\Core\Yugoslavia\YugoslaviaCitizenInformationExtractor;
+use Reducktion\Socrates\Core\Europe\Yugoslavia\YugoslaviaCitizenInformationExtractor;
 
 class SerbiaCitizenInformationExtractor implements CitizenInformationExtractor
 {
diff --git a/src/Core/Serbia/SerbiaIdValidator.php b/src/Core/Europe/Serbia/SerbiaIdValidator.php
similarity index 85%
rename from src/Core/Serbia/SerbiaIdValidator.php
rename to src/Core/Europe/Serbia/SerbiaIdValidator.php
index 861d18c..db9e7cf 100644
--- a/src/Core/Serbia/SerbiaIdValidator.php
+++ b/src/Core/Europe/Serbia/SerbiaIdValidator.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Serbia;
+namespace Reducktion\Socrates\Core\Europe\Serbia;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
-use Reducktion\Socrates\Core\Yugoslavia\YugoslaviaIdValidator;
+use Reducktion\Socrates\Core\Europe\Yugoslavia\YugoslaviaIdValidator;
 
 class SerbiaIdValidator implements IdValidator
 {
diff --git a/src/Core/Slovakia/SlovakiaCitizenInformationExtractor.php b/src/Core/Europe/Slovakia/SlovakiaCitizenInformationExtractor.php
similarity index 77%
rename from src/Core/Slovakia/SlovakiaCitizenInformationExtractor.php
rename to src/Core/Europe/Slovakia/SlovakiaCitizenInformationExtractor.php
index 753982c..bab576e 100644
--- a/src/Core/Slovakia/SlovakiaCitizenInformationExtractor.php
+++ b/src/Core/Europe/Slovakia/SlovakiaCitizenInformationExtractor.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Slovakia;
+namespace Reducktion\Socrates\Core\Europe\Slovakia;
 
 use Reducktion\Socrates\Models\Citizen;
 use Reducktion\Socrates\Exceptions\InvalidIdException;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
-use Reducktion\Socrates\Core\CzechRepublic\CzechRepublicIdValidator;
-use Reducktion\Socrates\Core\Czechoslovakia\CzechoslovakiaCitizenInformationExtractor;
+use Reducktion\Socrates\Core\Europe\CzechRepublic\CzechRepublicIdValidator;
+use Reducktion\Socrates\Core\Europe\Czechoslovakia\CzechoslovakiaCitizenInformationExtractor;
 
 class SlovakiaCitizenInformationExtractor implements CitizenInformationExtractor
 {
diff --git a/src/Core/Slovakia/SlovakiaIdValidator.php b/src/Core/Europe/Slovakia/SlovakiaIdValidator.php
similarity index 79%
rename from src/Core/Slovakia/SlovakiaIdValidator.php
rename to src/Core/Europe/Slovakia/SlovakiaIdValidator.php
index 898ce62..b3f25fe 100644
--- a/src/Core/Slovakia/SlovakiaIdValidator.php
+++ b/src/Core/Europe/Slovakia/SlovakiaIdValidator.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Slovakia;
+namespace Reducktion\Socrates\Core\Europe\Slovakia;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
-use Reducktion\Socrates\Core\Czechoslovakia\CzechoslovakiaIdValidator;
+use Reducktion\Socrates\Core\Europe\Czechoslovakia\CzechoslovakiaIdValidator;
 
 class SlovakiaIdValidator implements IdValidator
 {
diff --git a/src/Core/Slovenia/SloveniaCitizenInformationExtractor.php b/src/Core/Europe/Slovenia/SloveniaCitizenInformationExtractor.php
similarity index 84%
rename from src/Core/Slovenia/SloveniaCitizenInformationExtractor.php
rename to src/Core/Europe/Slovenia/SloveniaCitizenInformationExtractor.php
index 43de87c..0782641 100644
--- a/src/Core/Slovenia/SloveniaCitizenInformationExtractor.php
+++ b/src/Core/Europe/Slovenia/SloveniaCitizenInformationExtractor.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Slovenia;
+namespace Reducktion\Socrates\Core\Europe\Slovenia;
 
 use Reducktion\Socrates\Exceptions\InvalidIdException;
 use Reducktion\Socrates\Models\Citizen;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
-use Reducktion\Socrates\Core\Yugoslavia\YugoslaviaCitizenInformationExtractor;
+use Reducktion\Socrates\Core\Europe\Yugoslavia\YugoslaviaCitizenInformationExtractor;
 
 class SloveniaCitizenInformationExtractor implements CitizenInformationExtractor
 {
diff --git a/src/Core/Slovenia/SloveniaIdValidator.php b/src/Core/Europe/Slovenia/SloveniaIdValidator.php
similarity index 84%
rename from src/Core/Slovenia/SloveniaIdValidator.php
rename to src/Core/Europe/Slovenia/SloveniaIdValidator.php
index 11e7029..38a7d3e 100644
--- a/src/Core/Slovenia/SloveniaIdValidator.php
+++ b/src/Core/Europe/Slovenia/SloveniaIdValidator.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Slovenia;
+namespace Reducktion\Socrates\Core\Europe\Slovenia;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
-use Reducktion\Socrates\Core\Yugoslavia\YugoslaviaIdValidator;
+use Reducktion\Socrates\Core\Europe\Yugoslavia\YugoslaviaIdValidator;
 
 class SloveniaIdValidator implements IdValidator
 {
diff --git a/src/Core/Spain/SpainIdValidator.php b/src/Core/Europe/Spain/SpainIdValidator.php
similarity index 91%
rename from src/Core/Spain/SpainIdValidator.php
rename to src/Core/Europe/Spain/SpainIdValidator.php
index 6c23e21..fd2f996 100644
--- a/src/Core/Spain/SpainIdValidator.php
+++ b/src/Core/Europe/Spain/SpainIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Spain;
+namespace Reducktion\Socrates\Core\Europe\Spain;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
@@ -10,7 +10,7 @@
  *
  * Algorithm adapted from: http://www.interior.gob.es/web/servicios-al-ciudadano/dni/calculo-del-digito-de-control-del-nif-nie.
  *
- * @package Reducktion\Socrates\Core\Spain
+ * @package Reducktion\Socrates\Core\Europe\Spain
  */
 class SpainIdValidator implements IdValidator
 {
diff --git a/src/Core/Sweden/SwedenCitizenInformationExtractor.php b/src/Core/Europe/Sweden/SwedenCitizenInformationExtractor.php
similarity index 76%
rename from src/Core/Sweden/SwedenCitizenInformationExtractor.php
rename to src/Core/Europe/Sweden/SwedenCitizenInformationExtractor.php
index 0056b8a..0804554 100644
--- a/src/Core/Sweden/SwedenCitizenInformationExtractor.php
+++ b/src/Core/Europe/Sweden/SwedenCitizenInformationExtractor.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Sweden;
+namespace Reducktion\Socrates\Core\Europe\Sweden;
 
-use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
 use Reducktion\Socrates\Exceptions\InvalidIdException;
@@ -49,7 +49,8 @@ private function convertToTenDigitId(string $id): string
     {
         $tenDigitId = '';
 
-        for ($i = 0; $i < strlen($id); $i++) {
+        $length = strlen($id);
+        for ($i = 0; $i < $length; $i++) {
             if ($i > 1) {
                 $tenDigitId .= $id[$i];
             }
@@ -61,24 +62,24 @@ private function convertToTenDigitId(string $id): string
 
     private function getGender(string $id): string
     {
-        return $id[8] % 2 == 0 ? Gender::FEMALE : Gender::MALE;
+        return $id[8] % 2 === 0 ? Gender::FEMALE : Gender::MALE;
     }
 
-    private function getDateOfBirth(string $id, bool $isOverOneHundredYearsOld): Carbon
+    private function getDateOfBirth(string $id, bool $isOverOneHundredYearsOld): DateTime
     {
         $dateDigits = substr($id, 0, 6);
         [$twoDigitYear, $month, $day] = str_split($dateDigits, 2);
 
         if ($isOverOneHundredYearsOld) {
-            $year = Carbon::createFromFormat('Y', "19$twoDigitYear")->format('Y');
+            $year = DateTime::createFromFormat('Y', "19$twoDigitYear")->format('Y');
         } else {
-            $presentTwoDigitYear = (int) now()->format('y');
+            $presentTwoDigitYear = (int) (new DateTime())->format('y');
 
             $year = $twoDigitYear < $presentTwoDigitYear
-                ? Carbon::createFromFormat('y', (string) $twoDigitYear)->format('Y')
-                : Carbon::createFromFormat('Y', "19$twoDigitYear")->format('Y');
+                ? DateTime::createFromFormat('y', (string) $twoDigitYear)->format('Y')
+                : DateTime::createFromFormat('Y', "19$twoDigitYear")->format('Y');
         }
 
-        return Carbon::createFromFormat('Y-m-d', "$year-$month-$day");
+        return new DateTime("$year-$month-$day");
     }
 }
diff --git a/src/Core/Sweden/SwedenIdValidator.php b/src/Core/Europe/Sweden/SwedenIdValidator.php
similarity index 93%
rename from src/Core/Sweden/SwedenIdValidator.php
rename to src/Core/Europe/Sweden/SwedenIdValidator.php
index 11c1b5a..df2df0a 100644
--- a/src/Core/Sweden/SwedenIdValidator.php
+++ b/src/Core/Europe/Sweden/SwedenIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Sweden;
+namespace Reducktion\Socrates\Core\Europe\Sweden;
 
 use DateTime;
 use Reducktion\Socrates\Contracts\IdValidator;
@@ -69,7 +69,8 @@ private function convertToTenDigitId(string $id): string
     {
         $tenDigitId = '';
 
-        for ($i = 0; $i < strlen($id); $i++) {
+        $length = strlen($id);
+        for ($i = 0; $i < $length; $i++) {
             if ($i > 1) {
                 $tenDigitId .= $id[$i];
             }
diff --git a/src/Core/Switzerland/SwitzerlandIdValidator.php b/src/Core/Europe/Switzerland/SwitzerlandIdValidator.php
similarity index 95%
rename from src/Core/Switzerland/SwitzerlandIdValidator.php
rename to src/Core/Europe/Switzerland/SwitzerlandIdValidator.php
index 25a208b..5a03c57 100644
--- a/src/Core/Switzerland/SwitzerlandIdValidator.php
+++ b/src/Core/Europe/Switzerland/SwitzerlandIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Switzerland;
+namespace Reducktion\Socrates\Core\Europe\Switzerland;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
diff --git a/src/Core/Turkey/TurkeyIdValidator.php b/src/Core/Europe/Turkey/TurkeyIdValidator.php
similarity index 95%
rename from src/Core/Turkey/TurkeyIdValidator.php
rename to src/Core/Europe/Turkey/TurkeyIdValidator.php
index 1454e86..19641c7 100644
--- a/src/Core/Turkey/TurkeyIdValidator.php
+++ b/src/Core/Europe/Turkey/TurkeyIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Turkey;
+namespace Reducktion\Socrates\Core\Europe\Turkey;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
diff --git a/src/Core/Ukraine/UkraineCitizenInformationExtractor.php b/src/Core/Europe/Ukraine/UkraineCitizenInformationExtractor.php
similarity index 77%
rename from src/Core/Ukraine/UkraineCitizenInformationExtractor.php
rename to src/Core/Europe/Ukraine/UkraineCitizenInformationExtractor.php
index 456b3e9..926c591 100644
--- a/src/Core/Ukraine/UkraineCitizenInformationExtractor.php
+++ b/src/Core/Europe/Ukraine/UkraineCitizenInformationExtractor.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Ukraine;
+namespace Reducktion\Socrates\Core\Europe\Ukraine;
 
-use Carbon\Carbon;
+use DateTime;
+use DateInterval;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
 use Reducktion\Socrates\Exceptions\InvalidIdException;
@@ -32,10 +33,13 @@ private function getGender(int $genderDigit): string
         return $genderDigit % 2 ? Gender::MALE : Gender::FEMALE;
     }
 
-    private function getDateOfBirth(string $id): Carbon
+    private function getDateOfBirth(string $id): DateTime
     {
         $birthDateDigits = (int) substr($id, 0, 5) - 1;
 
-        return Carbon::createFromFormat('Y-m-d', '1900-01-01')->addDays($birthDateDigits);
+        $date = new DateTime('1900-01-01');
+        $date->add(new DateInterval("P{$birthDateDigits}D"));
+
+        return $date;
     }
 }
diff --git a/src/Core/Ukraine/UkraineIdValidator.php b/src/Core/Europe/Ukraine/UkraineIdValidator.php
similarity index 95%
rename from src/Core/Ukraine/UkraineIdValidator.php
rename to src/Core/Europe/Ukraine/UkraineIdValidator.php
index 6229606..e2b3359 100644
--- a/src/Core/Ukraine/UkraineIdValidator.php
+++ b/src/Core/Europe/Ukraine/UkraineIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Ukraine;
+namespace Reducktion\Socrates\Core\Europe\Ukraine;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
diff --git a/src/Core/UnitedKingdom/UnitedKingdomIdValidator.php b/src/Core/Europe/UnitedKingdom/UnitedKingdomIdValidator.php
similarity index 89%
rename from src/Core/UnitedKingdom/UnitedKingdomIdValidator.php
rename to src/Core/Europe/UnitedKingdom/UnitedKingdomIdValidator.php
index 38c90e6..61930f5 100644
--- a/src/Core/UnitedKingdom/UnitedKingdomIdValidator.php
+++ b/src/Core/Europe/UnitedKingdom/UnitedKingdomIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\UnitedKingdom;
+namespace Reducktion\Socrates\Core\Europe\UnitedKingdom;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
@@ -52,19 +52,13 @@ public function validate(string $id): bool
 
         $firstTwoCharacters = substr($id, 0, 2);
 
-        if (
-            $firstTwoCharacters === 'GB'
+        return !($firstTwoCharacters === 'GB'
             || $firstTwoCharacters === 'NK'
             || $firstTwoCharacters === 'TN'
             || $firstTwoCharacters === 'BG'
             || $firstTwoCharacters === 'KN'
             || $firstTwoCharacters === 'NT'
-            || $firstTwoCharacters === 'ZZ'
-        ) {
-            return false;
-        }
-
-        return true;
+            || $firstTwoCharacters === 'ZZ');
     }
 
     private function sanitize(string $id)
diff --git a/src/Core/Yugoslavia/YugoslaviaCitizenInformationExtractor.php b/src/Core/Europe/Yugoslavia/YugoslaviaCitizenInformationExtractor.php
similarity index 82%
rename from src/Core/Yugoslavia/YugoslaviaCitizenInformationExtractor.php
rename to src/Core/Europe/Yugoslavia/YugoslaviaCitizenInformationExtractor.php
index 07be919..a974f07 100644
--- a/src/Core/Yugoslavia/YugoslaviaCitizenInformationExtractor.php
+++ b/src/Core/Europe/Yugoslavia/YugoslaviaCitizenInformationExtractor.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Yugoslavia;
+namespace Reducktion\Socrates\Core\Europe\Yugoslavia;
 
-use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Exceptions\InvalidIdException;
-use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Exceptions\UnrecognisedPlaceOfBirthException;
 use Reducktion\Socrates\Models\Citizen;
 
@@ -13,8 +12,6 @@ class YugoslaviaCitizenInformationExtractor
 {
     public static function extract(string $id): Citizen
     {
-        $id = trim($id);
-
         if (! (new YugoslaviaIdValidator())::validate($id)) {
             throw new InvalidIdException();
         }
@@ -36,13 +33,13 @@ private static function getGender(string $id): string
         return ((int) substr($id, 9, 3)) < 500 ? Gender::MALE : Gender::FEMALE;
     }
 
-    private static function getDateOfBirth(string $id): Carbon
+    private static function getDateOfBirth(string $id): DateTime
     {
         $day = substr($id, 0, 2);
         $month = substr($id, 2, 2);
         $year = (int) substr($id, 4, 3);
 
-        $currentYear = (string) Carbon::now()->year;
+        $currentYear = (int) (new DateTime())->format('Y');
 
         if ($year + 1000 < $currentYear && $year + 1000 > 1900) {
             $year += 1000;
@@ -50,7 +47,7 @@ private static function getDateOfBirth(string $id): Carbon
             $year += 2000;
         }
 
-        return Carbon::createFromFormat('Y-m-d', "$year-$month-$day");
+        return new DateTime("$year-$month-$day");
     }
 
     private static function getPlaceOfBirth(string $id): string
diff --git a/src/Core/Yugoslavia/YugoslaviaIdValidator.php b/src/Core/Europe/Yugoslavia/YugoslaviaIdValidator.php
similarity index 93%
rename from src/Core/Yugoslavia/YugoslaviaIdValidator.php
rename to src/Core/Europe/Yugoslavia/YugoslaviaIdValidator.php
index e6f5eaf..ec20cde 100644
--- a/src/Core/Yugoslavia/YugoslaviaIdValidator.php
+++ b/src/Core/Europe/Yugoslavia/YugoslaviaIdValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Yugoslavia;
+namespace Reducktion\Socrates\Core\Europe\Yugoslavia;
 
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 
@@ -8,7 +8,6 @@ class YugoslaviaIdValidator
 {
     public static function validate(string $id): bool
     {
-        $id = trim($id);
         $idLength = strlen($id);
 
         if ($idLength !== 13) {
diff --git a/src/Core/Yugoslavia/YugoslaviaRegions.php b/src/Core/Europe/Yugoslavia/YugoslaviaRegions.php
similarity index 98%
rename from src/Core/Yugoslavia/YugoslaviaRegions.php
rename to src/Core/Europe/Yugoslavia/YugoslaviaRegions.php
index cd1bbc4..60b1138 100644
--- a/src/Core/Yugoslavia/YugoslaviaRegions.php
+++ b/src/Core/Europe/Yugoslavia/YugoslaviaRegions.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Yugoslavia;
+namespace Reducktion\Socrates\Core\Europe\Yugoslavia;
 
 class YugoslaviaRegions
 {
@@ -8,7 +8,7 @@ class YugoslaviaRegions
             '01' => 'foreigner in Bosnia and Herzegovina',
             '02' => 'foreigners in Montenegro',
             '03' => 'foreigners in Croatia',
-            '04' => ' foreigners in North Macedonia',
+            '04' => 'foreigners in North Macedonia',
             '05' => 'foreigners in Slovenia',
             '06' => 'foreigners in Central Serbia',
             '07' => 'foreigners in Serbian province of Vojvodina',
diff --git a/src/Core/NorthAmerica/Canada/CanadaIdValidator.php b/src/Core/NorthAmerica/Canada/CanadaIdValidator.php
new file mode 100644
index 0000000..b040430
--- /dev/null
+++ b/src/Core/NorthAmerica/Canada/CanadaIdValidator.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Reducktion\Socrates\Core\NorthAmerica\Canada;
+
+use Reducktion\Socrates\Contracts\IdValidator;
+use Reducktion\Socrates\Exceptions\InvalidLengthException;
+
+/**
+ * Class CanadaIdValidator
+ *
+ * Algorithm adapted from: https://en.wikipedia.org/wiki/Social_Insurance_Number
+ *
+ * @package Reducktion\Socrates\Core\NorthAmerica\Canada
+ */
+class CanadaIdValidator implements IdValidator
+{
+    public function validate(string $id): bool
+    {
+        $id = $this->sanitize($id);
+
+        $idArray = str_split($id);
+        $parity = count($idArray) % 2;
+        $sum = 0;
+        foreach ($idArray as $key => $value) {
+            if ($key % 2 === $parity) {
+                $value *= 2;
+            }
+
+            $sum += ($value >= 10 ? $value - 9 : $value);
+        }
+
+        return $sum % 10 === 0;
+    }
+
+    public function sanitize(string $id): string
+    {
+        $id = str_replace(' ', '', $id);
+
+        $idLength = strlen($id);
+
+        if ($idLength !== 9) {
+            throw new InvalidLengthException('Canadian SIN', '9', $idLength);
+        }
+
+        return $id;
+    }
+}
diff --git a/src/Core/NorthAmerica/Mexico/MexicoCitizenInformationExtractor.php b/src/Core/NorthAmerica/Mexico/MexicoCitizenInformationExtractor.php
new file mode 100644
index 0000000..b0daca0
--- /dev/null
+++ b/src/Core/NorthAmerica/Mexico/MexicoCitizenInformationExtractor.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Reducktion\Socrates\Core\NorthAmerica\Mexico;
+
+use DateTime;
+use Reducktion\Socrates\Exceptions\InvalidIdException;
+use Reducktion\Socrates\Models\Citizen;
+use Reducktion\Socrates\Constants\Gender;
+use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
+
+class MexicoCitizenInformationExtractor implements CitizenInformationExtractor
+{
+    public function extract(string $id): Citizen
+    {
+        if (!(new MexicoIdValidator())->validate($id)) {
+            throw new InvalidIdException();
+        }
+
+        $gender = $this->getGender($id);
+        $dob = $this->getDateOfBirth($id);
+
+        $citizen = new Citizen();
+        $citizen->setGender($gender);
+        $citizen->setDateOfBirth($dob);
+
+        return $citizen;
+    }
+
+    private function getGender(string $id): string
+    {
+        $identifier = $id[10];
+
+        if ($identifier === 'H') {
+            return Gender::MALE;
+        }
+
+        return Gender::FEMALE;
+    }
+
+    private function getDateOfBirth(string $id): DateTime
+    {
+        $year = (int) substr($id, 4, 2);
+        $month = (int) substr($id, 6, 2);
+        $day = (int) substr($id, 8, 2);
+
+        $year += is_numeric($id[16]) ? 1900 : 2000;
+
+        return new DateTime("$year-$month-$day");
+    }
+}
diff --git a/src/Core/NorthAmerica/Mexico/MexicoIdValidator.php b/src/Core/NorthAmerica/Mexico/MexicoIdValidator.php
new file mode 100644
index 0000000..c09c032
--- /dev/null
+++ b/src/Core/NorthAmerica/Mexico/MexicoIdValidator.php
@@ -0,0 +1,158 @@
+<?php
+
+namespace Reducktion\Socrates\Core\NorthAmerica\Mexico;
+
+use Reducktion\Socrates\Contracts\IdValidator;
+use Reducktion\Socrates\Exceptions\InvalidLengthException;
+
+/**
+ * Class MexicoIdValidator
+ *
+ * Algorithm adapted from: https://sayari.com/blog/breaking-down-mexican-national-id/.
+ *
+ * @package Reducktion\Socrates\Core\Mexico
+ */
+class MexicoIdValidator implements IdValidator
+{
+    private const VOWELS = ['A', 'E', 'I', 'O', 'U'];
+    private const GENDERS = ['H', 'M'];
+    private const BLACKLISTED_NAMES = [
+        'BACA', 'BAKA', 'BUEI', 'BUEY', 'CACA', 'CACO', 'CAGA', 'CAGO', 'CAKA', 'CAKO', 'COGE', 'COGI', 'COJA', 'COJE',
+        'COJI', 'COJO', 'COLA', 'CULO', 'FALO', 'FETO', 'GETA', 'GUEI', 'GUEY', 'JETA', 'JOTO', 'KACA', 'KACO', 'KAGA',
+        'KAGO', 'KAKA', 'KAKO', 'KOGE', 'KOGI', 'KOJA', 'KOJE', 'KOJI', 'KOJO', 'KOLA', 'KULO', 'LILO', 'LOCA', 'LOCO',
+        'LOKA', 'LOKO', 'MAME', 'MAMO', 'MEAR', 'MEAS', 'MEON', 'MIAR', 'MION', 'MOCO', 'MOKO', 'MULA', 'MULO', 'NACA',
+        'NACO', 'PEDA', 'PEDO', 'PENE', 'PIPI', 'PITO', 'POPO', 'PUTA', 'PUTO', 'QULO', 'RATA', 'ROBA', 'ROBE', 'ROBO',
+        'RUIN', 'SENO', 'TETA', 'VACA', 'VAGA', 'VAGO', 'VAKA', 'VUEI', 'VUEY', 'WUEI', 'WUEY',
+    ];
+
+    public function validate(string $id): bool
+    {
+        $id = $this->sanitize($id);
+
+        if (!$this->validateRegex($id)) {
+            return false;
+        }
+
+        if (!$this->validateNames(substr($id, 0, 3))) {
+            return false;
+        }
+
+        if (!$this->validateBirthdate(substr($id, 4, 6))) {
+            return false;
+        }
+
+        if (!$this->validateGender($id[10])) {
+            return false;
+        }
+
+        if (!$this->validateState(substr($id, 11, 2))) {
+            return false;
+        }
+
+        if (!$this->validateConsonants(substr($id, 13, 3))) {
+            return false;
+        }
+
+        return $this->validateChecksum($id);
+    }
+
+    private function sanitize(string $id): string
+    {
+        $idLength = strlen($id);
+
+        if ($idLength !== 18) {
+            throw new InvalidLengthException('Mexico CURP', 18, $idLength);
+        }
+
+        return strtoupper($id);
+    }
+
+    private function validateRegex(string $id): bool
+    {
+        return preg_match('/^[A-Z]{4}\d{6}[A-Z]{6}[0-9A-Z]\d$/', $id, $matches);
+    }
+
+    private function validateNames(string $names): bool
+    {
+        $length = strlen($names);
+        for ($i = 0; $i < $length; $i++) {
+            if (!ctype_alpha($names[$i])) {
+                return false;
+            }
+
+            if (!in_array($names[1], self::VOWELS)) {
+                return false;
+            }
+        }
+
+        if (in_array($names, self::BLACKLISTED_NAMES)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private function validateBirthdate(string $birthdate): bool
+    {
+        $length = strlen($birthdate);
+        for ($i = 0; $i < $length; $i++) {
+            if (!is_numeric($birthdate[$i])) {
+                return false;
+            }
+        }
+
+        if (!in_array((int)substr($birthdate, 2, 2), range(1, 12), true)) {
+            return false;
+        }
+
+        if (!in_array((int)substr($birthdate, 4, 2), range(1, 31), true)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private function validateGender(string $gender): bool
+    {
+        return !(!ctype_alpha($gender) || !in_array($gender, self::GENDERS));
+    }
+
+    private function validateState(string $state): bool
+    {
+        return !(!array_key_exists($state, MexicoStatesList::$states) || !ctype_alpha($state));
+    }
+
+    private function validateConsonants(string $names): bool
+    {
+        if (!ctype_alpha($names)) {
+            return false;
+        }
+
+        $length = strlen($names);
+        for ($i = 0; $i < $length; $i++) {
+            if (in_array($names[$i], self::VOWELS)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private function validateChecksum(string $id): bool
+    {
+        $alphabet = "0123456789ABCDEFGHIJKLMN&OPQRSTUVWXYZ";
+
+        if (!is_numeric($id[17])) {
+            return false;
+        }
+
+        $code = substr($id, 0, 17);
+        $check = 0;
+
+        $length = strlen($code);
+        for ($i = 0; $i < $length; $i++) {
+            $check += array_search($code[$i], str_split($alphabet), true) * (18 - $i);
+        }
+        return (10 - $check % 10) % 10 === (int) $id[17];
+    }
+}
diff --git a/src/Core/NorthAmerica/Mexico/MexicoStatesList.php b/src/Core/NorthAmerica/Mexico/MexicoStatesList.php
new file mode 100644
index 0000000..fa75982
--- /dev/null
+++ b/src/Core/NorthAmerica/Mexico/MexicoStatesList.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Reducktion\Socrates\Core\NorthAmerica\Mexico;
+
+/**
+ * Class MexicoStatesList
+ *
+ * Data taken from: http://sistemas.uaeh.edu.mx/dce/admisiones/docs/guia_CURP.pdf
+ *
+ * @package Reducktion\Socrates\Core\Mexico
+ */
+class MexicoStatesList
+{
+    public static $states = [
+        'AS' => "AGUASCALIENTES",
+        'BS' => "BAJA CALIFORNIA SUR",
+        'CL' => "COAHUILA",
+        'CS' => "CHIAPAS",
+        'DF' => "DISTRITO FEDERAL",
+        'GT' => "GUANAJUATO",
+        'HG' => "HIDALGO",
+        'MC' => "MÉXICO",
+        'MS' => "MORELOS",
+        'NL' => "NUEVO LEÓN",
+        'PL' => "PUEBLA",
+        'QR' => "QUINTANA ROO",
+        'SL' => "SINALOA",
+        'TC' => "TABASCO",
+        'TL' => "TLAXCALA",
+        'YN' => "YUCATÁN",
+        'NE' => "NACIDO EN EL EXTRANJERO",
+        'BC' => "BAJA CALIFORNIA",
+        'CC' => "CAMPECHE",
+        'CM' => "COLIMA",
+        'CH' => "CHIHUAHUA",
+        'DG' => "DURANGO",
+        'GR' => "GUERRERO",
+        'JC' => "JALISCO",
+        'MN' => "MICHOACÁN",
+        'NT' => "NAYARIT",
+        'OC' => "OAXACA",
+        'QT' => "QUERÉTARO",
+        'SP' => "SAN LUIS POTOSÍ",
+        'SR' => "SONORA",
+        'TS' => "TAMAULIPAS",
+        'VZ' => "VERACRUZ",
+        'ZS' => "ZACATECAS"
+    ];
+}
diff --git a/src/Core/NorthAmerica/UnitedStates/UnitedStatesIdValidator.php b/src/Core/NorthAmerica/UnitedStates/UnitedStatesIdValidator.php
new file mode 100644
index 0000000..78309a4
--- /dev/null
+++ b/src/Core/NorthAmerica/UnitedStates/UnitedStatesIdValidator.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Reducktion\Socrates\Core\NorthAmerica\UnitedStates;
+
+use Reducktion\Socrates\Contracts\IdValidator;
+use Reducktion\Socrates\Exceptions\InvalidLengthException;
+
+/**
+ * Class UnitedStatesIdValidator
+ *
+ * Algorithm adapted from: https://en.wikipedia.org/wiki/Social_Security_number
+ *
+ * @package Reducktion\Socrates\Core\NorthAmerica\UnitedStates
+ */
+class UnitedStatesIdValidator implements IdValidator
+{
+    private $blacklist = [
+        '078051120',
+        '219099999',
+        '457555462'
+    ];
+
+    public function validate(string $id): bool
+    {
+        $id = $this->sanitize($id);
+
+        if (in_array($id, $this->blacklist, true)) {
+            return false;
+        }
+
+        $areaNumber = (int) substr($id, 0, 3);
+        if ($areaNumber === 0 || $areaNumber === 666 || $areaNumber > 899) {
+            return false;
+        }
+
+        $groupNumber = (int) substr($id, 3, 2);
+        if ($groupNumber === 0) {
+            return false;
+        }
+
+        $serialNumber = (int) substr($id, 5, 4);
+
+        return !($serialNumber === 0);
+    }
+
+    private function sanitize(string $id): string
+    {
+        $id = str_replace('-', '', $id);
+
+        $idLength = strlen($id);
+
+        if ($idLength !== 9) {
+            throw new InvalidLengthException('American SSN', '9', $idLength);
+        }
+
+        return $id;
+    }
+}
diff --git a/src/Core/SouthAmerica/Argentina/ArgentinaIdValidator.php b/src/Core/SouthAmerica/Argentina/ArgentinaIdValidator.php
new file mode 100644
index 0000000..bad835b
--- /dev/null
+++ b/src/Core/SouthAmerica/Argentina/ArgentinaIdValidator.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Reducktion\Socrates\Core\SouthAmerica\Argentina;
+
+use Reducktion\Socrates\Contracts\IdValidator;
+use Reducktion\Socrates\Exceptions\InvalidLengthException;
+
+/**
+ * Class ArgentinaIdValidator
+ *
+ * Algorithm adapted from: https://es.wikipedia.org/wiki/Clave_%C3%9Anica_de_Identificaci%C3%B3n_Tributaria
+ *
+ * @package Reducktion\Socrates\Core\SouthAmerica\Argentina
+ */
+class ArgentinaIdValidator implements IdValidator
+{
+    public function validate(string $id): bool
+    {
+        $id = $this->sanitize($id);
+
+        $sum = 0;
+        for ($i = 0; $i <= 9; ++$i) {
+            $sum += $id[9 - $i] * (2 + ($i % 6));
+        }
+
+        $checksum = 11 - ($sum % 11);
+        $checksum = $checksum === 11 ? 0 : $checksum;
+
+        return (string)$checksum === $id[-1];
+    }
+
+    private function sanitize(string $id): string
+    {
+        $id = preg_replace('/[\D]/', '', $id);
+
+        $idLength = strlen($id);
+
+        if ($idLength !== 11) {
+            throw new InvalidLengthException('Argentina CUIL/CUIT', '11', $idLength);
+        }
+
+        return $id;
+    }
+}
diff --git a/src/Core/Brazil/BrazilIdValidator.php b/src/Core/SouthAmerica/Brazil/BrazilIdValidator.php
similarity index 77%
rename from src/Core/Brazil/BrazilIdValidator.php
rename to src/Core/SouthAmerica/Brazil/BrazilIdValidator.php
index b68c81a..f746944 100644
--- a/src/Core/Brazil/BrazilIdValidator.php
+++ b/src/Core/SouthAmerica/Brazil/BrazilIdValidator.php
@@ -1,10 +1,17 @@
 <?php
 
-namespace Reducktion\Socrates\Core\Brazil;
+namespace Reducktion\Socrates\Core\SouthAmerica\Brazil;
 
 use Reducktion\Socrates\Contracts\IdValidator;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 
+/**
+ * Class BrazilIdValidator
+ *
+ * Algorithm adapted from: https://pt.wikipedia.org/wiki/Cadastro_de_pessoas_f%C3%ADsicas#Algoritmo
+ *
+ * @package Reducktion\Socrates\Core\SouthAmerica\Brazil
+ */
 class BrazilIdValidator implements IdValidator
 {
     public function validate(string $id): bool
@@ -23,7 +30,6 @@ static function ($digit) {
             )
         );
 
-        // source: https://pt.wikipedia.org/wiki/Cadastro_de_pessoas_f%C3%ADsicas#Algoritmo
         $v1 = 0;
         $v2 = 0;
         for ($i = 0; $i < 9; $i++) {
@@ -32,7 +38,7 @@ static function ($digit) {
         }
 
         $v1 = ($v1 % 11) % 10;
-        $v2 = $v2 + ($v1 * 9);
+        $v2 += ($v1 * 9);
         $v2 = ($v2 % 11) % 10;
 
         return $checksum === (($v1 * 10) + $v2);
@@ -40,7 +46,7 @@ static function ($digit) {
 
     private function sanitize(string $id): string
     {
-        $id = preg_replace('/[^0-9]/', '', $id);
+        $id = preg_replace('/[\D]/', '', $id);
 
         $idLength = strlen($id);
 
diff --git a/src/Core/SouthAmerica/Chile/ChileIdValidator.php b/src/Core/SouthAmerica/Chile/ChileIdValidator.php
new file mode 100644
index 0000000..bf9e823
--- /dev/null
+++ b/src/Core/SouthAmerica/Chile/ChileIdValidator.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Reducktion\Socrates\Core\SouthAmerica\Chile;
+
+use Reducktion\Socrates\Contracts\IdValidator;
+use Reducktion\Socrates\Exceptions\InvalidLengthException;
+
+/**
+ * Class ChileIdValidator
+ *
+ * Algorithm adapted from: https://es.wikipedia.org/wiki/Anexo:Implementaciones_para_algoritmo_de_rut
+ *
+ * @package Reducktion\Socrates\Core\SouthAmerica\Chile
+ */
+class ChileIdValidator implements IdValidator
+{
+    public function validate(string $id): bool
+    {
+        $id = $this->sanitize($id);
+
+        $lastDigit = $id[-1];
+
+        $id = substr($id, 0, -1);
+
+        $sum = 1;
+        for ($m = 0; $id != 0; $id /= 10) {
+            $sum = ($sum + $id % 10 * (9 - $m++ % 6)) % 11;
+        }
+
+        $checksum = chr($sum ? $sum + 47 : 75);
+
+        return $checksum === $lastDigit;
+    }
+
+    private function sanitize(string $id): string
+    {
+        $lastDigitCharIsK = substr($id, -1) === 'K';
+        $id = preg_replace('/[\D]/', '', $id);
+
+        if (is_string($id)) {
+            $id .= $lastDigitCharIsK ? 'K' : '';
+        }
+
+        $idLength = strlen($id);
+
+        //The RUT number's format is: 7 or 8 digits, one dash, 1 check digit (0-9, K)
+        if ($idLength < 8 || $idLength > 9) {
+            throw new InvalidLengthException('Chile RUT', '8', $idLength);
+        }
+
+        return $id;
+    }
+}
diff --git a/src/Core/SouthAmerica/Ecuador/EcuadorIdValidator.php b/src/Core/SouthAmerica/Ecuador/EcuadorIdValidator.php
new file mode 100644
index 0000000..d9715fb
--- /dev/null
+++ b/src/Core/SouthAmerica/Ecuador/EcuadorIdValidator.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace Reducktion\Socrates\Core\SouthAmerica\Ecuador;
+
+use Reducktion\Socrates\Contracts\IdValidator;
+use Reducktion\Socrates\Exceptions\InvalidLengthException;
+
+/**
+ * Class EcuadorIdValidator
+ *
+ * Algorithm adapted from: [
+ * https://www.jybaro.com/blog/cedula-de-identidad-ecuatoriana/
+ * https://medium.com/@bryansuarez/c%C3%B3mo-validar-c%C3%A9dula-y-ruc-en-ecuador-b62c5666186f
+ * ]
+ *
+ * @package Reducktion\Socrates\Core\SouthAmerica\Ecuador
+ */
+class EcuadorIdValidator implements IdValidator
+{
+    public function validate(string $id): bool
+    {
+        $id = $this->sanitize($id);
+
+        $provinceCode = (int)substr($id, 0, 2);
+        $thirdDigit = (int)$id[2];
+        $sequenceNumber = substr($id, 0, 9);
+        $lastDigit = (int)$id[-1];
+
+        if ($provinceCode < 0 || $provinceCode > 24) {
+            return false;
+        }
+
+        if ($thirdDigit < 0 || $thirdDigit > 5) {
+            return false;
+        }
+
+        return $this->validateCheckDigit($sequenceNumber, $lastDigit);
+    }
+
+    private function sanitize(string $id): string
+    {
+        $id = preg_replace('/[\D]/', '', $id);
+
+        $idLength = strlen($id);
+
+        if ($idLength !== 10) {
+            throw new InvalidLengthException('Ecuador CI', '10', $idLength);
+        }
+
+        return $id;
+    }
+
+    protected function validateCheckDigit(string $sequence, int $lastDigit): bool
+    {
+        $coefficients = [2, 1, 2, 1, 2, 1, 2, 1, 2];
+
+        $sequence = array_map(
+            static function ($digit) {
+                return (int)$digit;
+            },
+            str_split($sequence)
+        );
+
+        $sum = 0;
+        foreach ($sequence as $key => $value) {
+            $posValue = $value * $coefficients[$key];
+
+            if ($posValue >= 10) {
+                $posValue = (int)array_sum(str_split($posValue));
+            }
+
+            $sum += $posValue;
+        }
+
+        $remainder = $sum % 10;
+        $result = $remainder !== 0 ? 10 - $remainder : 0;
+
+        return $result === $lastDigit;
+    }
+}
diff --git a/src/Core/SouthAmerica/Peru/PeruIdValidator.php b/src/Core/SouthAmerica/Peru/PeruIdValidator.php
new file mode 100644
index 0000000..c80bdd7
--- /dev/null
+++ b/src/Core/SouthAmerica/Peru/PeruIdValidator.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Reducktion\Socrates\Core\SouthAmerica\Peru;
+
+use Reducktion\Socrates\Contracts\IdValidator;
+use Reducktion\Socrates\Exceptions\InvalidLengthException;
+
+/**
+ * Class PeruIdValidator
+ *
+ * Algorithm adapted from: [
+ * https://www.excelnegocios.com/algoritmo-digito-verificador-dni-en-excel/
+ * https://mag.elcomercio.pe/respuestas/cual-es-el-digito-verificador-de-mi-dni-documento-nacional-de-identidad-reniec-peru-nnda-nnlt-noticia/?ref=ecr
+ * ]
+ *
+ * @package Reducktion\Socrates\Core\SouthAmerica\Peru
+ */
+class PeruIdValidator implements IdValidator
+{
+    public function validate(string $id): bool
+    {
+        $id = $this->sanitize($id);
+
+        $sum = 0;
+        $factors = [3, 2, 7, 6, 5, 4, 3, 2];
+        $numberKeys = [6, 7, 8, 9, 0, 1, 1, 2, 3, 4, 5];
+        $charKeys = ['K', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J'];
+
+        $dniDigits = substr($id, 0, -1);
+
+        if (preg_match('/[\D]/', $dniDigits)) {
+            return false;
+        }
+
+        $dniDigits = array_map(
+            static function ($digit) {
+                return (int)$digit;
+            },
+            str_split($dniDigits)
+        );
+
+        $lastDigit = substr($id, -1);
+
+        $countDniDigits = count($dniDigits);
+
+        for ($i = 0; $i < $countDniDigits; $i++) {
+            $sum += $dniDigits[$i] * $factors[$i];
+        }
+
+        $key = 11 - ($sum % 11);
+        $key = $key === 11 ? 0 : $key;
+
+        return is_numeric($lastDigit)
+            ? $numberKeys[$key] === (int)$lastDigit
+            : $charKeys[$key] === strtoupper($lastDigit);
+    }
+
+    private function sanitize(string $id): string
+    {
+        $id = preg_replace('/[\W]/', '', $id);
+
+        $idLength = strlen($id);
+
+        if ($idLength !== 9) {
+            throw new InvalidLengthException('Peru CUI', '9', $idLength);
+        }
+
+        return $id;
+    }
+}
diff --git a/src/Core/SouthAmerica/Uruguay/UruguayIdValidator.php b/src/Core/SouthAmerica/Uruguay/UruguayIdValidator.php
new file mode 100644
index 0000000..47e673c
--- /dev/null
+++ b/src/Core/SouthAmerica/Uruguay/UruguayIdValidator.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Reducktion\Socrates\Core\SouthAmerica\Uruguay;
+
+use Reducktion\Socrates\Contracts\IdValidator;
+use Reducktion\Socrates\Exceptions\InvalidLengthException;
+
+/**
+ * Class UruguayIdValidator
+ *
+ * Algorithm adapted from: https://github.com/DiMaNacho/validarci
+ *
+ * @package Reducktion\Socrates\Core\SouthAmerica\Uruguay
+ */
+class UruguayIdValidator implements IdValidator
+{
+    public function validate(string $id): bool
+    {
+        $id = $this->sanitize($id);
+        $lastDigit = (int)$id[-1];
+        $id = str_pad($id, 7, '0', STR_PAD_LEFT);
+
+        $a = 0;
+
+        $baseNumber = "2987634";
+        for ($i = 0; $i < 7; $i++) {
+            $baseDigit = (int)$baseNumber[$i];
+            $ciDigit = (int)$id[$i];
+
+            $a += ($baseDigit * $ciDigit) % 10;
+        }
+
+        $validationDigit = $a % 10 === 0 ? 0 : 10 - $a % 10;
+
+        return $lastDigit === $validationDigit;
+    }
+
+    private function sanitize(string $id): string
+    {
+        $id = preg_replace('/[\D]/', '', $id);
+
+        $idLength = strlen($id);
+
+        if ($idLength !== 8) {
+            throw new InvalidLengthException('Uruguay CI', '8', $idLength);
+        }
+
+        return $id;
+    }
+}
diff --git a/src/Exceptions/InvalidLengthException.php b/src/Exceptions/InvalidLengthException.php
index ae4e298..0bc9a50 100644
--- a/src/Exceptions/InvalidLengthException.php
+++ b/src/Exceptions/InvalidLengthException.php
@@ -4,13 +4,6 @@
 
 class InvalidLengthException extends \LogicException
 {
-    /**
-     * The name of the National Identification Number.
-     *
-     * @var string
-     */
-    private $designation;
-
     /**
      * Description of the number of characters the National Identification Number should have.
      *
@@ -28,15 +21,12 @@ class InvalidLengthException extends \LogicException
     /**
      * Create a new InvalidLengthException instance.
      *
-     * @param  string  $designation
-     * @param  string  $requiredCharacters
-     * @param  string  $givenCharacters
-     * @return void
+     * @param string $designation The National Identification Number designation
+     * @param string $requiredCharacters The correct number of characters as string
+     * @param string $givenCharacters The characters that the user has given us
      */
     public function __construct(string $designation, string $requiredCharacters, string $givenCharacters)
     {
-        $this->designation = $designation;
-
         $this->requiredCharacters = $requiredCharacters;
 
         $this->givenCharacters = $givenCharacters;
diff --git a/src/Models/Citizen.php b/src/Models/Citizen.php
index d7224ee..0b1ae29 100644
--- a/src/Models/Citizen.php
+++ b/src/Models/Citizen.php
@@ -2,6 +2,7 @@
 
 namespace Reducktion\Socrates\Models;
 
+use DateTime;
 use Carbon\Carbon;
 use Reducktion\Socrates\Exceptions\UnsupportedOperationException;
 
@@ -15,9 +16,9 @@ class Citizen
     private $gender;
 
     /**
-     * The date of birth as a Carbon instance.
+     * The date of birth as a DateTime object.
      *
-     * @var Carbon|null
+     * @var DateTime|null
      */
     private $dateOfBirth;
 
@@ -29,7 +30,7 @@ class Citizen
     private $placeOfBirth;
 
     /**
-     * Get the gender.
+     * Get the citizen's gender as a string.
      *
      * @return  string|null
      */
@@ -39,17 +40,29 @@ public function getGender(): ?string
     }
 
     /**
-     * Get the date of birth.
+     * Get the citizen's date of birth as a Carbon instance.
      *
+     * @deprecated v1.3.0 This method will be deprecated in the next release of Socrates.
+     *                    Please use getDateOfBirthNative() instead.
      * @return Carbon|null
      */
     public function getDateOfBirth(): ?Carbon
+    {
+        return Carbon::instance($this->dateOfBirth);
+    }
+
+    /**
+     * Get the citizen's date of birth as a DateTime object.
+     *
+     * @return DateTime|null
+     */
+    public function getDateOfBirthNative(): ?DateTime
     {
         return $this->dateOfBirth;
     }
 
     /**
-     * Get the age.
+     * Get the citizen's age as a number or null.
      *
      * @return int|null
      */
@@ -59,11 +72,11 @@ public function getAge(): ?int
             throw new UnsupportedOperationException('Citizen date of birth is null.');
         }
 
-        return $this->dateOfBirth->age;
+        return (new DateTime())->diff($this->dateOfBirth)->y;
     }
 
     /**
-     * Get the place of birth.
+     * Get the citizen's place of birth as a string or null.
      *
      * @return string|null
      */
@@ -73,7 +86,7 @@ public function getPlaceOfBirth(): ?string
     }
 
     /**
-     * Set the gender.
+     * Set the citizen's gender.
      *
      * @param  string  $gender
      * @return void
@@ -84,18 +97,18 @@ public function setGender(string $gender): void
     }
 
     /**
-     * Set the date of birth.
+     * Set the citizen's date of birth.
      *
-     * @param  Carbon  $dateOfBirth
+     * @param  DateTime  $dateOfBirth
      * @return  void
      */
-    public function setDateOfBirth(Carbon $dateOfBirth): void
+    public function setDateOfBirth(DateTime $dateOfBirth): void
     {
         $this->dateOfBirth = $dateOfBirth;
     }
 
     /**
-     * Set the place of birth.
+     * Set the citizen's place of birth.
      *
      * @param  string  $placeOfBirth
      * @return void
diff --git a/src/Socrates.php b/src/Socrates.php
index 339c018..3a8d89e 100644
--- a/src/Socrates.php
+++ b/src/Socrates.php
@@ -69,16 +69,10 @@ public function validateId(string $id, string $countryCode = ''): bool
      */
     private function formatCountryCode(string $countryCode): string
     {
-        $runningLaravel = class_exists(\Illuminate\Support\Facades\App::class);
-
-        if (! $runningLaravel && $countryCode === '') {
+        if ($countryCode === '') {
             throw new InvalidCountryCodeException('No country code provided.');
         }
 
-        if ($runningLaravel && $countryCode === '') {
-            $countryCode = \Illuminate\Support\Facades\App::getLocale();
-        }
-
         $countryCodeLength = strlen($countryCode);
 
         if ($countryCodeLength !== 2 && $countryCodeLength !== 5) {
diff --git a/tests/CitizenInformationExtractorFactoryTest.php b/tests/CitizenInformationExtractorFactoryTest.php
new file mode 100644
index 0000000..1df4cca
--- /dev/null
+++ b/tests/CitizenInformationExtractorFactoryTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Reducktion\Socrates\Tests;
+
+use Reducktion\Socrates\Contracts\CitizenInformationExtractor;
+use Reducktion\Socrates\Core\CitizenInformationExtractorFactory;
+use RuntimeException;
+
+class CitizenInformationExtractorFactoryTest extends TestCase
+{
+    /** @test */
+    public function it_gets_extractor(): void
+    {
+        $extractor = CitizenInformationExtractorFactory::getExtractor('FI');
+        $this->assertInstanceOf(CitizenInformationExtractor::class, $extractor);
+    }
+
+    /** @test */
+    public function it_throws_for_unknown_country(): void
+    {
+        $this->expectException(RuntimeException::class);
+        CitizenInformationExtractorFactory::getExtractor('XX');
+    }
+}
diff --git a/tests/Feature/AlbaniaTest.php b/tests/Feature/Europe/AlbaniaTest.php
similarity index 63%
rename from tests/Feature/AlbaniaTest.php
rename to tests/Feature/Europe/AlbaniaTest.php
index ab3ed75..57ae9d3 100644
--- a/tests/Feature/AlbaniaTest.php
+++ b/tests/Feature/Europe/AlbaniaTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
+use DateTime;
 use Carbon\Carbon;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class AlbaniaTest extends FeatureTest
 {
@@ -20,32 +22,32 @@ protected function setUp(): void
             'bardhana' => [
                 'nid' => 'I05101999I',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1980-01-01'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1980-01-01')->age,
+                'dob' => new DateTime('1980-01-01'),
+                'age' => $this->calculateAge(new DateTime('1980-01-01')),
             ],
             'shufti' => [
                 'nid' => 'I90201535E',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1989-02-01'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1989-02-01')->age,
+                'dob' => new DateTime('1989-02-01'),
+                'age' => $this->calculateAge(new DateTime('1989-02-01')),
             ],
             'shyqe' => [
                 'nid' => 'J45423004V',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1994-04-23'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1994-04-23')->age,
+                'dob' => new DateTime('1994-04-23'),
+                'age' => $this->calculateAge(new DateTime('1994-04-23')),
             ],
             'elseid' => [
                 'nid' => 'H71211672R',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1977-12-11'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1977-12-11')->age,
+                'dob' => new DateTime('1977-12-11'),
+                'age' => $this->calculateAge(new DateTime('1977-12-11')),
             ],
             'hasna' => [
                 'nid' => 'I85413200A',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1988-04-13'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1988-04-13')->age,
+                'dob' => new DateTime('1988-04-13'),
+                'age' => $this->calculateAge(new DateTime('1988-04-13')),
             ],
         ];
 
@@ -62,10 +64,10 @@ public function test_extract_behaviour(): void
     {
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['nid'], 'AL');
-
-            $this->assertEquals($person['gender'], $citizen->getGender());
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
         }
 
         $this->expectException(InvalidLengthException::class);
@@ -76,13 +78,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['nid'], 'AL')
             );
         }
 
         foreach ($this->invalidIds as $invalidId) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($invalidId, 'AL')
             );
         }
diff --git a/tests/Feature/BelgiumTest.php b/tests/Feature/Europe/BelgiumTest.php
similarity index 55%
rename from tests/Feature/BelgiumTest.php
rename to tests/Feature/Europe/BelgiumTest.php
index e78bb14..2b8482e 100644
--- a/tests/Feature/BelgiumTest.php
+++ b/tests/Feature/Europe/BelgiumTest.php
@@ -1,16 +1,17 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
+use DateTime;
 use Carbon\Carbon;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class BelgiumTest extends FeatureTest
 {
     private $people;
-
     private $invalidIds;
 
     public function setUp(): void
@@ -21,33 +22,33 @@ public function setUp(): void
             'shahin' => [
                 'id' => '93.05.18-223.61',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1993-05-18'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1993-05-18')->age,
+                'dob' => new DateTime('1993-05-18'),
+                'age' => $this->calculateAge(new DateTime('1993-05-18')),
             ],
             'naoual' => [
                 'id' => '730111-361-73',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1973-01-11'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1973-01-11')->age,
+                'dob' => new DateTime('1973-01-11'),
+                'age' => $this->calculateAge(new DateTime('1973-01-11')),
             ],
             'xavi' => [
                 'id' => '75.12.05-137.14',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1975-12-05'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1975-12-05')->age,
-            ],
-            'ute' => [
-                'id' => '09.08.24-282.48',
-                'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2009-08-24'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2009-08-24')->age,
+                'dob' => new DateTime('1975-12-05'),
+                'age' => $this->calculateAge(new DateTime('1975-12-05')),
             ],
             'kurt' => [
                 'id' => '71.09.07-213.64',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1971-09-07'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1971-09-07')->age,
+                'dob' => new DateTime('1971-09-07'),
+                'age' => $this->calculateAge(new DateTime('1971-09-07')),
             ],
+            'mark' => [
+                'id' => '40.00.01-001.33',
+                'gender' => Gender::MALE,
+                'dob' => new DateTime('1940-01-01'),
+                'age' => $this->calculateAge(new DateTime('1940-01-01')),
+            ]
         ];
 
         $this->invalidIds = [
@@ -55,7 +56,10 @@ public function setUp(): void
             '97.12.03-123.12',
             '01.06.18-468.99',
             '64.04.09-874.43',
-            '12.10.23-954.11'
+            '12.10.23-954.11',
+            '09.08.24-282.48', // invalid age
+            '01.11.16-000.06', // invalid sequence number
+            '01.11.16-999.74'  // invalid sequence number
         ];
     }
 
@@ -63,9 +67,10 @@ public function test_extract_behaviour(): void
     {
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['id'], 'BE');
-            $this->assertEquals($person['gender'], $citizen->getGender());
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
         }
 
         $this->expectException(InvalidLengthException::class);
@@ -76,13 +81,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['id'], 'BE')
             );
         }
 
         foreach ($this->invalidIds as $id) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($id, 'BE')
             );
         }
diff --git a/tests/Feature/BosniaAndHerzegovinaTest.php b/tests/Feature/Europe/BosniaAndHerzegovinaTest.php
similarity index 65%
rename from tests/Feature/BosniaAndHerzegovinaTest.php
rename to tests/Feature/Europe/BosniaAndHerzegovinaTest.php
index 8338e1f..6342750 100644
--- a/tests/Feature/BosniaAndHerzegovinaTest.php
+++ b/tests/Feature/Europe/BosniaAndHerzegovinaTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
+use DateTime;
 use Carbon\Carbon;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class BosniaAndHerzegovinaTest extends FeatureTest
 {
@@ -20,36 +22,36 @@ protected function setUp(): void
             'Naser' => [
                 'jmbg' => '1502957172694',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1957-02-15'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1957-02-15')->age,
+                'dob' => new DateTime('1957-02-15'),
+                'age' => $this->calculateAge(new DateTime('1957-02-15')),
                 'pob' => 'Sarajevo - Bosnia and Herzegovina'
             ],
             'Imran' => [
                 'jmbg' => '2508995191483',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1995-08-25'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1995-08-25')->age,
+                'dob' => new DateTime('1995-08-25'),
+                'age' => $this->calculateAge(new DateTime('1995-08-25')),
                 'pob' => 'Zenica - Bosnia and Herzegovina'
             ],
             'Ajdin' => [
                 'jmbg' => '1012980163603',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1980-12-10'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1980-12-10')->age,
+                'dob' => new DateTime('1980-12-10'),
+                'age' => $this->calculateAge(new DateTime('1980-12-10')),
                 'pob' => 'Prijedor - Bosnia and Herzegovina'
             ],
             'Merjem' => [
                 'jmbg' => '1310963145538',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1963-10-13'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1963-10-13')->age,
+                'dob' => new DateTime('1963-10-13'),
+                'age' => $this->calculateAge(new DateTime('1963-10-13')),
                 'pob' => 'Livno - Bosnia and Herzegovina'
             ],
             'Eman' => [
                 'jmbg' => '1806998154160',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1998-06-18'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1998-06-18')->age,
+                'dob' => new DateTime('1998-06-18'),
+                'age' => $this->calculateAge(new DateTime('1998-06-18')),
                 'pob' => 'Mostar - Bosnia and Herzegovina'
             ]
         ];
@@ -68,10 +70,11 @@ public function test_extract_behaviour(): void
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['jmbg'], 'BA');
 
-            $this->assertEquals($person['gender'], $citizen->getGender());
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
-            $this->assertEquals($person['pob'], $citizen->getPlaceOfBirth());
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals($person['pob'], $citizen->getPlaceOfBirth());
         }
 
         $this->expectException(InvalidLengthException::class);
@@ -82,13 +85,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['jmbg'], 'BA')
             );
         }
 
         foreach ($this->invalidIds as $jmbg) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($jmbg, 'BA')
             );
         }
diff --git a/tests/Feature/BulgariaTest.php b/tests/Feature/Europe/BulgariaTest.php
similarity index 61%
rename from tests/Feature/BulgariaTest.php
rename to tests/Feature/Europe/BulgariaTest.php
index c0b611a..345a207 100644
--- a/tests/Feature/BulgariaTest.php
+++ b/tests/Feature/Europe/BulgariaTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
+use DateTime;
 use Carbon\Carbon;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class BulgariaTest extends FeatureTest
 {
@@ -20,38 +22,38 @@ protected function setUp(): void
             'Andrei' => [
                 'egn' => '7523169263',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1875-03-16'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1875-03-16')->age,
+                'dob' => new DateTime('1875-03-16'),
+                'age' => $this->calculateAge(new DateTime('1875-03-16')),
             ],
             'Lyuben' => [
                 'egn' => '8032056031',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1880-12-05'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1880-12-05')->age,
+                'dob' => new DateTime('1880-12-05'),
+                'age' => $this->calculateAge(new DateTime('1880-12-05')),
             ],
             'Bilyana' => [
                 'egn' => '8001010008',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1980-01-01'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1980-01-01')->age,
+                'dob' => new DateTime('1980-01-01'),
+                'age' => $this->calculateAge(new DateTime('1980-01-01')),
             ],
             'Kalina' => [
                 'egn' => '7501020018',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1975-01-02'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1975-01-02')->age,
+                'dob' => new DateTime('1975-01-02'),
+                'age' => $this->calculateAge(new DateTime('1975-01-02')),
             ],
             'Nedyalko' => [
                 'egn' => '7552010005',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2075-12-01'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2075-12-01')->age,
+                'dob' => new DateTime('2075-12-01'),
+                'age' => $this->calculateAge(new DateTime('2075-12-01')),
             ],
             'Tsveta' => [
                 'egn' => '7542011030',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2075-02-01'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2075-02-01')->age,
+                'dob' => new DateTime('2075-02-01'),
+                'age' => $this->calculateAge(new DateTime('2075-02-01')),
             ]
         ];
 
@@ -68,9 +70,10 @@ public function test_extract_behaviour(): void
     {
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['egn'], 'BG');
-            $this->assertEquals($person['gender'], $citizen->getGender());
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
         }
 
         $this->expectException(InvalidLengthException::class);
@@ -81,13 +84,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['egn'], 'BG')
             );
         }
 
         foreach ($this->invalidIds as $egn) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($egn, 'BG')
             );
         }
diff --git a/tests/Feature/CroatiaTest.php b/tests/Feature/Europe/CroatiaTest.php
similarity index 69%
rename from tests/Feature/CroatiaTest.php
rename to tests/Feature/Europe/CroatiaTest.php
index 53207bd..8a4c777 100644
--- a/tests/Feature/CroatiaTest.php
+++ b/tests/Feature/Europe/CroatiaTest.php
@@ -1,16 +1,18 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class CroatiaTest extends FeatureTest
 {
-    private $validIds;
     private $people;
+    private $validIds;
     private $invalidIds;
 
     protected function setUp(): void
@@ -29,36 +31,36 @@ protected function setUp(): void
             'Ivana' => [
                 'jmbg' => '1809988305313',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1988-09-18'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1988-09-18')->age,
+                'dob' => new DateTime('1988-09-18'),
+                'age' => $this->calculateAge(new DateTime('1988-09-18')),
                 'pob' => 'Osijek, Slavonia region - Croatia'
             ],
             'Ana' => [
                 'jmbg' => '0808928315425',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1928-08-08'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1928-08-08')->age,
+                'dob' => new DateTime('1928-08-08'),
+                'age' => $this->calculateAge(new DateTime('1928-08-08')),
                 'pob' => 'Bjelovar, Virovitica, Koprivnica, Pakrac, Podravina region - Croatia'
             ],
             'Marija' => [
                 'jmbg' => '1106961359224',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1961-06-11'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1961-06-11')->age,
+                'dob' => new DateTime('1961-06-11'),
+                'age' => $this->calculateAge(new DateTime('1961-06-11')),
                 'pob' => 'Gospić, Lika region - Croatia'
             ],
             'Stjepan' => [
                 'jmbg' => '1105951323209',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1951-05-11'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1951-05-11')->age,
+                'dob' => new DateTime('1951-05-11'),
+                'age' => $this->calculateAge(new DateTime('1951-05-11')),
                 'pob' => 'Varaždin, Međimurje region - Croatia'
             ],
             'Ivan' => [
                 'jmbg' => '2109971352638',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1971-09-21'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1971-09-21')->age,
+                'dob' => new DateTime('1971-09-21'),
+                'age' => $this->calculateAge(new DateTime('1971-09-21')),
                 'pob' => 'Gospić, Lika region - Croatia'
             ],
         ];
@@ -77,10 +79,11 @@ public function test_extract_behaviour(): void
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['jmbg'], 'HR');
 
-            $this->assertEquals($person['gender'], $citizen->getGender());
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
-            $this->assertEquals($person['pob'], $citizen->getPlaceOfBirth());
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals($person['pob'], $citizen->getPlaceOfBirth());
         }
 
         $this->expectException(InvalidLengthException::class);
@@ -95,19 +98,19 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->validIds as $oib) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($oib, 'HR')
             );
         }
 
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['jmbg'], 'HR')
             );
         }
 
         foreach ($this->invalidIds as $jmbg) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($jmbg, 'HR')
             );
         }
diff --git a/tests/Feature/CzechRepublicTest.php b/tests/Feature/Europe/CzechRepublicTest.php
similarity index 62%
rename from tests/Feature/CzechRepublicTest.php
rename to tests/Feature/Europe/CzechRepublicTest.php
index 9de7c32..4ba2db5 100644
--- a/tests/Feature/CzechRepublicTest.php
+++ b/tests/Feature/Europe/CzechRepublicTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class CzechRepublicTest extends FeatureTest
 {
@@ -20,32 +22,32 @@ protected function setUp(): void
             'Michal' => [
                 'rc' => '990224/9258',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1999-02-24'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1999-02-24')->age,
+                'dob' => new DateTime('1999-02-24'),
+                'age' => $this->calculateAge(new DateTime('1999-02-24')),
             ],
             'Tereza' => [
                 'rc' => '0157155328',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2001-07-15'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2001-07-15')->age,
+                'dob' => new DateTime('2001-07-15'),
+                'age' => $this->calculateAge(new DateTime('2001-07-15')),
             ],
             'Adéla' => [
                 'rc' => '975406/2494',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1997-04-06'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1997-04-06')->age,
+                'dob' => new DateTime('1997-04-06'),
+                'age' => $this->calculateAge(new DateTime('1997-04-06')),
             ],
             'Lucie' => [
                 'rc' => '956022/6027',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1995-10-22'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1995-10-22')->age,
+                'dob' => new DateTime('1995-10-22'),
+                'age' => $this->calculateAge(new DateTime('1995-10-22')),
             ],
             'Petr' => [
                 'rc' => '960326/2955',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1996-03-26'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1996-03-26')->age,
+                'dob' => new DateTime('1996-03-26'),
+                'age' => $this->calculateAge(new DateTime('1996-03-26')),
             ],
         ];
 
@@ -63,9 +65,10 @@ public function test_extract_behaviour(): void
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['rc'], 'CZ');
 
-            $this->assertEquals($person['gender'], $citizen->getGender());
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
         }
 
         $this->expectException(InvalidLengthException::class);
@@ -76,13 +79,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['rc'], 'CZ')
             );
         }
 
         foreach ($this->invalidIds as $rc) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($rc, 'CZ')
             );
         }
diff --git a/tests/Feature/DenmarkTest.php b/tests/Feature/Europe/DenmarkTest.php
similarity index 63%
rename from tests/Feature/DenmarkTest.php
rename to tests/Feature/Europe/DenmarkTest.php
index 1018666..25fea52 100644
--- a/tests/Feature/DenmarkTest.php
+++ b/tests/Feature/Europe/DenmarkTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class DenmarkTest extends FeatureTest
 {
@@ -20,32 +22,32 @@ protected function setUp(): void
             'julius' => [
                 'cpr' => '090792-1395',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1992-07-09'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1992-07-09')->age,
+                'dob' => new DateTime('1992-07-09'),
+                'age' => $this->calculateAge(new DateTime('1992-07-09')),
             ],
             'naja' => [
                 'cpr' => '070593-0600',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1993-05-07'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1993-05-07')->age,
+                'dob' => new DateTime('1993-05-07'),
+                'age' => $this->calculateAge(new DateTime('1993-05-07')),
             ],
             'rolla' => [
                 'cpr' => '150437-3068',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1937-04-15'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1937-04-15')->age,
+                'dob' => new DateTime('1937-04-15'),
+                'age' => $this->calculateAge(new DateTime('1937-04-15')),
             ],
             'thomas' => [
                 'cpr' => '160888-1995',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1988-08-16'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1988-08-16')->age,
+                'dob' => new DateTime('1988-08-16'),
+                'age' => $this->calculateAge(new DateTime('1988-08-16')),
             ],
             'mia' => [
                 'cpr' => '040404-7094',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2004-04-04'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2004-04-04')->age,
+                'dob' => new DateTime('2004-04-04'),
+                'age' => $this->calculateAge(new DateTime('2004-04-04')),
             ],
         ];
 
@@ -63,9 +65,10 @@ public function test_extract_behaviour(): void
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['cpr'], 'DK');
 
-            $this->assertEquals($person['gender'], $citizen->getGender());
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
         }
 
         $this->expectException(InvalidLengthException::class);
@@ -76,13 +79,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['cpr'], 'DK')
             );
         }
 
         foreach ($this->invalidIds as $cpr) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($cpr, 'DK')
             );
         }
diff --git a/tests/Feature/EstoniaTest.php b/tests/Feature/Europe/EstoniaTest.php
similarity index 62%
rename from tests/Feature/EstoniaTest.php
rename to tests/Feature/Europe/EstoniaTest.php
index 66c575b..6d608fc 100644
--- a/tests/Feature/EstoniaTest.php
+++ b/tests/Feature/Europe/EstoniaTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class EstoniaTest extends FeatureTest
 {
@@ -20,32 +22,32 @@ protected function setUp(): void
             'Grete' => [
                 'ik' => '48004119745',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1980-04-11'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1980-04-11')->age,
+                'dob' => new DateTime('1980-04-11'),
+                'age' => $this->calculateAge(new DateTime('1980-04-11')),
             ],
             'Kaarel' => [
                 'ik' => '50108040021',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2001-08-04'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2001-08-04')->age,
+                'dob' => new DateTime('2001-08-04'),
+                'age' => $this->calculateAge(new DateTime('2001-08-04')),
             ],
             'Seb' => [
                 'ik' => '36910180118',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1969-10-18'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1969-10-18')->age,
+                'dob' => new DateTime('1969-10-18'),
+                'age' => $this->calculateAge(new DateTime('1969-10-18')),
             ],
             'Jakob' => [
                 'ik' => '38601230129',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1986-01-23'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1986-01-23')->age,
+                'dob' => new DateTime('1986-01-23'),
+                'age' => $this->calculateAge(new DateTime('1986-01-23')),
             ],
             'Katarina' => [
                 'ik' => '60310275631',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2003-10-27'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2003-10-27')->age,
+                'dob' => new DateTime('2003-10-27'),
+                'age' => $this->calculateAge(new DateTime('2003-10-27')),
             ],
         ];
 
@@ -62,9 +64,10 @@ public function test_extract_behaviour(): void
     {
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['ik'], 'EE');
-            $this->assertEquals($person['gender'], $citizen->getGender());
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
         }
 
         $this->expectException(InvalidLengthException::class);
@@ -75,13 +78,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['ik'], 'EE')
             );
         }
 
         foreach ($this->invalidIds as $ik) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($ik, 'EE')
             );
         }
diff --git a/tests/Feature/FinlandTest.php b/tests/Feature/Europe/FinlandTest.php
similarity index 63%
rename from tests/Feature/FinlandTest.php
rename to tests/Feature/Europe/FinlandTest.php
index 423921e..d5c42ac 100644
--- a/tests/Feature/FinlandTest.php
+++ b/tests/Feature/Europe/FinlandTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class FinlandTest extends FeatureTest
 {
@@ -20,32 +22,32 @@ protected function setUp(): void
             'senja' => [
                 'hetu' => '040560-600E',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1960-05-04'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1960-05-04')->age
+                'dob' => new DateTime('1960-05-04'),
+                'age' => $this->calculateAge(new DateTime('1960-05-04')),
             ],
             'elias' => [
                 'hetu' => '121093-275N',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1993-10-12'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1993-10-12')->age
+                'dob' => new DateTime('1993-10-12'),
+                'age' => $this->calculateAge(new DateTime('1993-10-12')),
             ],
             'ida' => [
                 'hetu' => '260555-512H',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1955-05-26'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1955-05-26')->age
+                'dob' => new DateTime('1955-05-26'),
+                'age' => $this->calculateAge(new DateTime('1955-05-26')),
             ],
             'iiro' => [
                 'hetu' => '110416A479W',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2016-04-11'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2016-04-11')->age
+                'dob' => new DateTime('2016-04-11'),
+                'age' => $this->calculateAge(new DateTime('2016-04-11')),
             ],
             'stig' => [
                 'hetu' => '040403A2676',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2003-04-04'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2003-04-04')->age
+                'dob' => new DateTime('2003-04-04'),
+                'age' => $this->calculateAge(new DateTime('2003-04-04')),
             ]
         ];
 
@@ -63,9 +65,10 @@ public function test_extract_behaviour(): void
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['hetu'], 'FI');
 
-            $this->assertEquals($person['gender'], $citizen->getGender());
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
         }
 
         $this->expectException(InvalidLengthException::class);
@@ -76,13 +79,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['hetu'], 'FI')
             );
         }
 
         foreach ($this->invalidIds as $hetu) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($hetu, 'FI')
             );
         }
diff --git a/tests/Feature/FranceTest.php b/tests/Feature/Europe/FranceTest.php
similarity index 57%
rename from tests/Feature/FranceTest.php
rename to tests/Feature/Europe/FranceTest.php
index c950624..af2c111 100644
--- a/tests/Feature/FranceTest.php
+++ b/tests/Feature/Europe/FranceTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class FranceTest extends FeatureTest
 {
@@ -20,78 +22,78 @@ protected function setUp(): void
             'Annette' => [
                 'insee' => '2820819398814 09',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m', '1982-08'),
-                'age' => Carbon::createFromFormat('Y-m', '1982-08')->age,
+                'dob' => DateTime::createFromFormat('Y-m', '1982-08'),
+                'age' => $this->calculateAge(DateTime::createFromFormat('Y-m', '1982-08')),
                 'pob' => 'Corrèze'
             ],
             'Lance' => [
                 'insee' => '1350455179061 16',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m', '1935-04'),
-                'age' => Carbon::createFromFormat('Y-m', '1935-04')->age,
+                'dob' => DateTime::createFromFormat('Y-m', '1935-04'),
+                'age' => $this->calculateAge(DateTime::createFromFormat('Y-m', '1935-04')),
                 'pob' => 'Meuse'
             ],
             'Ancelote' => [
                 'insee' => '2381080214568 11',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m', '1938-10'),
-                'age' => Carbon::createFromFormat('Y-m', '1938-10')->age,
+                'dob' => DateTime::createFromFormat('Y-m', '1938-10'),
+                'age' => $this->calculateAge(DateTime::createFromFormat('Y-m', '1938-10')),
                 'pob' => 'Somme'
             ],
             'Lothair' => [
                 'insee' => '1880858704571 57',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m', '1988-08'),
-                'age' => Carbon::createFromFormat('Y-m', '1988-08')->age,
+                'dob' => DateTime::createFromFormat('Y-m', '1988-08'),
+                'age' => $this->calculateAge(DateTime::createFromFormat('Y-m', '1988-08')),
                 'pob' => 'Nièvre'
             ],
             'Millard' => [
                 'insee' => '1030307795669 72',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m', '2003-03'),
-                'age' => Carbon::createFromFormat('Y-m', '2003-03')->age,
+                'dob' => DateTime::createFromFormat('Y-m', '2003-03'),
+                'age' => $this->calculateAge(DateTime::createFromFormat('Y-m', '2003-03')),
                 'pob' => 'Ardèche'
             ],
             'Geoffrey' => [
                 'insee' => '1820897401154 75',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m', '1982-08'),
-                'age' => Carbon::createFromFormat('Y-m', '1982-08')->age,
+                'dob' => DateTime::createFromFormat('Y-m', '1982-08'),
+                'age' => $this->calculateAge(DateTime::createFromFormat('Y-m', '1982-08')),
                 'pob' => 'Réunion'
             ],
             'Galatee' => [
                 'insee' => '2041098718061 61',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m', '2004-10'),
-                'age' => Carbon::createFromFormat('Y-m', '2004-10')->age,
+                'dob' => DateTime::createFromFormat('Y-m', '2004-10'),
+                'age' => $this->calculateAge(DateTime::createFromFormat('Y-m', '2004-10')),
                 'pob' => 'French Polynesia'
             ],
             'Leal' => [
                 'insee' => '1103442505781 11',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m', '2010-04'),
-                'age' => Carbon::createFromFormat('Y-m', '2010-04')->age,
+                'dob' => DateTime::createFromFormat('Y-m', '2010-04'),
+                'age' => $this->calculateAge(DateTime::createFromFormat('Y-m', '2010-04')),
                 'pob' => 'Loire'
             ],
             'Odelette' => [
                 'insee' => '2115028242370 20',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y', '2011'),
-                'age' => Carbon::createFromFormat('Y', '2011')->age,
+                'dob' => DateTime::createFromFormat('Y', '2011'),
+                'age' => $this->calculateAge(DateTime::createFromFormat('Y', '2011')),
                 'pob' => 'Eure-et-Loir'
             ],
             'Roch' => [
                 'insee' => '199072A228070 10',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m', '1999-07'),
-                'age' => Carbon::createFromFormat('Y-m', '1999-07')->age,
+                'dob' => DateTime::createFromFormat('Y-m', '1999-07'),
+                'age' => $this->calculateAge(DateTime::createFromFormat('Y-m', '1999-07')),
                 'pob' => 'Corse-du-Sud'
             ],
             'Nadine' => [
                 'insee' => '257092B844458 87',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m', '1957-09'),
-                'age' => Carbon::createFromFormat('Y-m', '1957-09')->age,
+                'dob' => DateTime::createFromFormat('Y-m', '1957-09'),
+                'age' => $this->calculateAge(DateTime::createFromFormat('Y-m', '1957-09')),
                 'pob' => 'Haute-Corse'
             ]
         ];
@@ -109,10 +111,11 @@ public function test_extract_behaviour(): void
     {
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['insee'], 'FR');
-            $this->assertEquals($person['gender'], $citizen->getGender());
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
-            $this->assertEquals($person['pob'], $citizen->getPlaceOfBirth());
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals($person['pob'], $citizen->getPlaceOfBirth());
         }
 
         $this->expectException(InvalidLengthException::class);
@@ -123,13 +126,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['insee'], 'FR')
             );
         }
 
         foreach ($this->invalidIds as $insee) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($insee, 'FR')
             );
         }
diff --git a/tests/Feature/Europe/GermanyTest.php b/tests/Feature/Europe/GermanyTest.php
new file mode 100644
index 0000000..54486d3
--- /dev/null
+++ b/tests/Feature/Europe/GermanyTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Reducktion\Socrates\Tests\Feature\Europe;
+
+use Reducktion\Socrates\Exceptions\InvalidLengthException;
+use Reducktion\Socrates\Exceptions\UnsupportedOperationException;
+use Reducktion\Socrates\Laravel\Facades\Socrates;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
+
+class GermanyTest extends FeatureTest
+{
+    private $validIds;
+    private $invalidIds;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->validIds = [
+            '81872495633',
+            '48954371207',
+            '55492670836',
+            '12345678995',
+            '11234567890'
+        ];
+
+        $this->invalidIds = [
+            '01234567812',
+            '81872495631',
+            '48954371206',
+            '55492670834',
+            '11234567899'
+        ];
+    }
+
+    public function test_extract_behaviour(): void
+    {
+        $this->expectException(UnsupportedOperationException::class);
+
+        Socrates::getCitizenDataFromId('81872495633', 'DE');
+    }
+
+    public function test_validation_behaviour(): void
+    {
+        foreach ($this->validIds as $id) {
+            self::assertTrue(
+                Socrates::validateId($id, 'DE')
+            );
+        }
+
+        foreach ($this->invalidIds as $invalidId) {
+            self::assertFalse(
+                Socrates::validateId($invalidId, 'DE')
+            );
+        }
+
+        $this->expectException(InvalidLengthException::class);
+
+        Socrates::validateId('0123456789', 'DE');
+    }
+}
diff --git a/tests/Feature/GreeceTest.php b/tests/Feature/Europe/GreeceTest.php
similarity index 89%
rename from tests/Feature/GreeceTest.php
rename to tests/Feature/Europe/GreeceTest.php
index 2e8a871..e25a28c 100644
--- a/tests/Feature/GreeceTest.php
+++ b/tests/Feature/Europe/GreeceTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Exceptions\UnsupportedOperationException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class GreeceTest extends FeatureTest
 {
@@ -45,13 +46,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->validIds as $id) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($id, 'GR')
             );
         }
 
         foreach ($this->invalidIds as $invalidId) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($invalidId, 'GR')
             );
         }
diff --git a/tests/Feature/HungaryTest.php b/tests/Feature/Europe/HungaryTest.php
similarity index 61%
rename from tests/Feature/HungaryTest.php
rename to tests/Feature/Europe/HungaryTest.php
index c59f599..d352098 100644
--- a/tests/Feature/HungaryTest.php
+++ b/tests/Feature/Europe/HungaryTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class HungaryTest extends FeatureTest
 {
@@ -20,32 +22,32 @@ protected function setUp(): void
             'Aliz' => [
                 'pin' => '2-720216-1673',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1972-02-16'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1972-02-16')->age
+                'dob' => new DateTime('1972-02-16'),
+                'age' => $this->calculateAge(new DateTime('1972-02-16')),
             ],
             'Dora' => [
                 'pin' => '2-690609-5528',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1969-06-09'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1969-06-09')->age
+                'dob' => new DateTime('1969-06-09'),
+                'age' => $this->calculateAge(new DateTime('1969-06-09')),
             ],
             'Jolan' => [
                 'pin' => '2-840320-0414',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1984-03-20'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1984-03-20')->age
+                'dob' => new DateTime('1984-03-20'),
+                'age' => $this->calculateAge(new DateTime('1984-03-20')),
             ],
             'Kapolcs' => [
                 'pin' => '3-101010-5646',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2010-10-10'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2010-10-10')->age
+                'dob' => new DateTime('2010-10-10'),
+                'age' => $this->calculateAge(new DateTime('2010-10-10')),
             ],
             'Vincze' => [
                 'pin' => '3-080321-8523',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2008-03-21'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2008-03-21')->age
+                'dob' => new DateTime('2008-03-21'),
+                'age' => $this->calculateAge(new DateTime('2008-03-21')),
             ],
         ];
 
@@ -56,9 +58,10 @@ public function test_extract_behaviour(): void
     {
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['pin'], 'HU');
-            $this->assertEquals($person['gender'], $citizen->getGender());
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
         }
 
         $this->expectException(InvalidLengthException::class);
@@ -69,13 +72,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['pin'], 'HU')
             );
         }
 
         foreach ($this->invalidIds as $pin) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($pin, 'BG')
             );
         }
diff --git a/tests/Feature/IcelandTest.php b/tests/Feature/Europe/IcelandTest.php
similarity index 60%
rename from tests/Feature/IcelandTest.php
rename to tests/Feature/Europe/IcelandTest.php
index d881841..837a966 100644
--- a/tests/Feature/IcelandTest.php
+++ b/tests/Feature/Europe/IcelandTest.php
@@ -1,10 +1,12 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class IcelandTest extends FeatureTest
 {
@@ -18,28 +20,28 @@ protected function setUp(): void
         $this->people = [
             'andi' => [
                 'kt' => '0902862349',
-                'dob' => Carbon::createFromFormat('Y-m-d', '1986-02-09'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1986-02-09')->age,
+                'dob' => new DateTime('1986-02-09'),
+                'age' => $this->calculateAge(new DateTime('1986-02-09')),
             ],
             'freyja' => [
                 'kt' => '120174-3399',
-                'dob' => Carbon::createFromFormat('Y-m-d', '1974-01-12'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1974-01-12')->age,
+                'dob' => new DateTime('1974-01-12'),
+                'age' => $this->calculateAge(new DateTime('1974-01-12')),
             ],
             'nair' => [
                 'kt' => '1808905059',
-                'dob' => Carbon::createFromFormat('Y-m-d', '1990-08-18'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1990-08-18')->age,
+                'dob' => new DateTime('1990-08-18'),
+                'age' => $this->calculateAge(new DateTime('1990-08-18')),
             ],
             'eva' => [
                 'kt' => '2008108569',
-                'dob' => Carbon::createFromFormat('Y-m-d', '1910-08-20'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1910-08-20')->age,
+                'dob' => new DateTime('1910-08-20'),
+                'age' => $this->calculateAge(new DateTime('1910-08-20')),
             ],
             'hrafn' => [
                 'kt' => '100303-4930',
-                'dob' => Carbon::createFromFormat('Y-m-d', '2003-03-10'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2003-03-10')->age,
+                'dob' => new DateTime('2003-03-10'),
+                'age' => $this->calculateAge(new DateTime('2003-03-10')),
             ],
         ];
 
@@ -57,8 +59,9 @@ public function test_extract_behaviour(): void
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['kt'], 'IS');
 
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
         }
 
         $this->expectException(InvalidLengthException::class);
@@ -69,13 +72,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['kt'], 'IS')
             );
         }
 
         foreach ($this->invalidIds as $kt) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($kt, 'IS')
             );
         }
diff --git a/tests/Feature/IrelandTest.php b/tests/Feature/Europe/IrelandTest.php
similarity index 88%
rename from tests/Feature/IrelandTest.php
rename to tests/Feature/Europe/IrelandTest.php
index 76bb332..2e79519 100644
--- a/tests/Feature/IrelandTest.php
+++ b/tests/Feature/Europe/IrelandTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Exceptions\UnsupportedOperationException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class IrelandTest extends FeatureTest
 {
@@ -42,13 +43,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->validIds as $id) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($id, 'IE')
             );
         }
 
         foreach ($this->invalidIds as $id) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($id, 'IE')
             );
         }
diff --git a/tests/Feature/ItalyTest.php b/tests/Feature/Europe/ItalyTest.php
similarity index 65%
rename from tests/Feature/ItalyTest.php
rename to tests/Feature/Europe/ItalyTest.php
index b2b945c..bb82037 100644
--- a/tests/Feature/ItalyTest.php
+++ b/tests/Feature/Europe/ItalyTest.php
@@ -1,12 +1,14 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidIdException;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class ItalyTest extends FeatureTest
 {
@@ -21,43 +23,43 @@ protected function setUp(): void
             'matteo moretti' => [
                 'fc' => 'MRTMTT25D09F205Z',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1925-04-09'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1925-04-09')->age,
+                'dob' => new DateTime('1925-04-09'),
+                'age' => $this->calculateAge(new DateTime('1925-04-09')),
                 'pob' => 'MILANO (MI)'
             ],
             'samantha miller' => [
                 'fc' => 'MLLSNT82P65Z404U',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1982-09-25'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1982-09-25')->age,
+                'dob' => new DateTime('1982-09-25'),
+                'age' => $this->calculateAge(new DateTime('1982-09-25')),
                 'pob' => 'STATI UNITI D\'AMERICA'
             ],
             'delmo castiglione' => [
                 'fc' => 'DLMCTG75B07H227Y',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1975-02-07'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1975-02-07')->age,
+                'dob' => new DateTime('1975-02-07'),
+                'age' => $this->calculateAge(new DateTime('1975-02-07')),
                 'pob' => 'REINO (BN)'
             ],
             'elsa barese' => [
                 'fc' => 'BRSLSE08D50H987B',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2008-04-10'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2008-04-10')->age,
+                'dob' => new DateTime('2008-04-10'),
+                'age' => $this->calculateAge(new DateTime('2008-04-10')),
                 'pob' => 'SAN MARTINO ALFIERI (AT)'
             ],
             'dario marcelo' => [
                 'fc' => 'MRCDRA01A13A065E',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2001-01-13'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2001-01-13')->age,
+                'dob' => new DateTime('2001-01-13'),
+                'age' => $this->calculateAge(new DateTime('2001-01-13')),
                 'pob' => 'AFRICO (RC)'
             ],
             'dario marchesani' => [
                 'fc' => 'MRCDRALMAMPALSRE',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2001-01-13'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2001-01-13')->age,
+                'dob' => new DateTime('2001-01-13'),
+                'age' => $this->calculateAge(new DateTime('2001-01-13')),
                 'pob' => 'AFRICO (RC)'
             ]
         ];
@@ -76,10 +78,11 @@ public function test_extract_behaviour(): void
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['fc'], 'IT');
 
-            $this->assertEquals($person['gender'], $citizen->getGender());
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
-            $this->assertEquals($person['pob'], $citizen->getPlaceOfBirth());
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals($person['pob'], $citizen->getPlaceOfBirth());
         }
 
         $this->expectException(InvalidIdException::class);
@@ -90,13 +93,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['fc'], 'IT')
             );
         }
 
         foreach ($this->invalidIds as $fc) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($fc, 'IT')
             );
         }
diff --git a/tests/Feature/KosovoTest.php b/tests/Feature/Europe/KosovoTest.php
similarity index 63%
rename from tests/Feature/KosovoTest.php
rename to tests/Feature/Europe/KosovoTest.php
index c9b9fce..05f4066 100644
--- a/tests/Feature/KosovoTest.php
+++ b/tests/Feature/Europe/KosovoTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class KosovoTest extends FeatureTest
 {
@@ -20,36 +22,36 @@ protected function setUp(): void
             'Fatbard' => [
                 'jmbg' => '1009950933098',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1950-09-10'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1950-09-10')->age,
+                'dob' => new DateTime('1950-09-10'),
+                'age' => $this->calculateAge(new DateTime('1950-09-10')),
                 'pob' => 'Peć region (part of Peć District) - Kosovo'
             ],
             'Erblina' => [
                 'jmbg' => '2601966955857',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1966-01-26'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1966-01-26')->age,
+                'dob' => new DateTime('1966-01-26'),
+                'age' => $this->calculateAge(new DateTime('1966-01-26')),
                 'pob' => 'Prizren region (Prizren District) - Kosovo'
             ],
             'Ajkuna' => [
                 'jmbg' => '2202962926257',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1962-02-22'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1962-02-22')->age,
+                'dob' => new DateTime('1962-02-22'),
+                'age' => $this->calculateAge(new DateTime('1962-02-22')),
                 'pob' => 'Kosovska Mitrovica region (Kosovska Mitrovica District) - Kosovo'
             ],
             'Esad' => [
                 'jmbg' => '1404924982109',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1924-04-14'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1924-04-14')->age,
+                'dob' => new DateTime('1924-04-14'),
+                'age' => $this->calculateAge(new DateTime('1924-04-14')),
                 'pob' => 'Kosovo'
             ],
             'Guzim' => [
                 'jmbg' => '2103921983019',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1921-03-21'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1921-03-21')->age,
+                'dob' => new DateTime('1921-03-21'),
+                'age' => $this->calculateAge(new DateTime('1921-03-21')),
                 'pob' => 'Kosovo'
             ],
         ];
@@ -62,10 +64,11 @@ public function test_extract_behaviour(): void
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['jmbg'], 'XK');
 
-            $this->assertEquals($person['gender'], $citizen->getGender());
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
-            $this->assertEquals($person['pob'], $citizen->getPlaceOfBirth());
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals($person['pob'], $citizen->getPlaceOfBirth());
         }
 
         $this->expectException(InvalidLengthException::class);
@@ -76,13 +79,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['jmbg'], 'XK')
             );
         }
 
         foreach ($this->invalidIds as $jmbg) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($jmbg, 'XK')
             );
         }
diff --git a/tests/Feature/LatviaTest.php b/tests/Feature/Europe/LatviaTest.php
similarity index 70%
rename from tests/Feature/LatviaTest.php
rename to tests/Feature/Europe/LatviaTest.php
index 5492673..8a6e3e0 100644
--- a/tests/Feature/LatviaTest.php
+++ b/tests/Feature/Europe/LatviaTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Exceptions\UnsupportedOperationException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class LatviaTest extends FeatureTest
 {
@@ -20,28 +22,28 @@ protected function setUp(): void
         $this->supportedExtractionPeople = [
             'Agnese' => [
                 'pk' => '120673-10053',
-                'dob' => Carbon::createFromFormat('Y-m-d', '1973-06-12'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1973-06-12')->age
+                'dob' => new DateTime('1973-06-12'),
+                'age' => $this->calculateAge(new DateTime('1973-06-12')),
             ],
             'Rainers' => [
                 'pk' => '031098-10386',
-                'dob' => Carbon::createFromFormat('Y-m-d', '1998-10-03'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1998-10-03')->age
+                'dob' => new DateTime('1998-10-03'),
+                'age' => $this->calculateAge(new DateTime('1998-10-03')),
             ],
             'Kin' => [
                 'pk' => '250302-20559',
-                'dob' => Carbon::createFromFormat('Y-m-d', '2002-03-25'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2002-03-25')->age
+                'dob' => new DateTime('2002-03-25'),
+                'age' => $this->calculateAge(new DateTime('2002-03-25')),
             ],
             'Anton' => [
                 'pk' => '300863-10955',
-                'dob' => Carbon::createFromFormat('Y-m-d', '1963-08-30'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1963-08-30')->age
+                'dob' => new DateTime('1963-08-30'),
+                'age' => $this->calculateAge(new DateTime('1963-08-30')),
             ],
             'Karlis' => [
                 'pk' => '171210-20739',
-                'dob' => Carbon::createFromFormat('Y-m-d', '2010-12-17'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2010-12-17')->age
+                'dob' => new DateTime('2010-12-17'),
+                'age' => $this->calculateAge(new DateTime('2010-12-17')),
             ]
         ];
 
@@ -76,8 +78,9 @@ public function test_extract_behaviour(): void
     {
         foreach ($this->supportedExtractionPeople as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['pk'], 'LV');
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
         }
 
         $this->expectException(UnsupportedOperationException::class);
@@ -93,13 +96,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->supportedExtractionPeople as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['pk'], 'LV')
             );
         }
 
         foreach ($this->invalidIds as $pk) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($pk, 'LV')
             );
         }
diff --git a/tests/Feature/LithuaniaTest.php b/tests/Feature/Europe/LithuaniaTest.php
similarity index 62%
rename from tests/Feature/LithuaniaTest.php
rename to tests/Feature/Europe/LithuaniaTest.php
index 6ee4baf..2c83998 100644
--- a/tests/Feature/LithuaniaTest.php
+++ b/tests/Feature/Europe/LithuaniaTest.php
@@ -1,16 +1,17 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class LithuaniaTest extends FeatureTest
 {
     private $people;
-
     private $invalidIds;
 
     public function setUp(): void
@@ -21,32 +22,32 @@ public function setUp(): void
             'janis' => [
                 'ak' => '38409152012',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1984-09-15'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1984-09-15')->age
+                'dob' => new DateTime('1984-09-15'),
+                'age' => $this->calculateAge(new DateTime('1984-09-15')),
             ],
             'natas' => [
                 'ak' => '31710058023',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1917-10-05'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1917-10-05')->age
+                'dob' => new DateTime('1917-10-05'),
+                'age' => $this->calculateAge(new DateTime('1917-10-05')),
             ],
             'daiva' => [
                 'ak' => '44804129713',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1948-04-12'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1948-04-12')->age
+                'dob' => new DateTime('1948-04-12'),
+                'age' => $this->calculateAge(new DateTime('1948-04-12')),
             ],
             'geta' => [
                 'ak' => '60607279626',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2006-07-27'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2006-07-27')->age
+                'dob' => new DateTime('2006-07-27'),
+                'age' => $this->calculateAge(new DateTime('2006-07-27')),
             ],
             'domynikas' => [
                 'ak' => '50508199254',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2005-08-19'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2005-08-19')->age
+                'dob' => new DateTime('2005-08-19'),
+                'age' => $this->calculateAge(new DateTime('2005-08-19')),
             ]
         ];
 
@@ -63,9 +64,10 @@ public function test_extract_behaviour(): void
     {
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['ak'], 'LT');
-            $this->assertEquals($person['gender'], $citizen->getGender());
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
         }
 
         $this->expectException(InvalidLengthException::class);
@@ -76,13 +78,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['ak'], 'LT')
             );
         }
 
         foreach ($this->invalidIds as $ak) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($ak, 'LT')
             );
         }
diff --git a/tests/Feature/Europe/LuxembourgTest.php b/tests/Feature/Europe/LuxembourgTest.php
new file mode 100644
index 0000000..e8e6018
--- /dev/null
+++ b/tests/Feature/Europe/LuxembourgTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Reducktion\Socrates\Tests\Feature\Europe;
+
+use RuntimeException;
+use Reducktion\Socrates\Laravel\Facades\Socrates;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
+use Reducktion\Socrates\Exceptions\UnsupportedOperationException;
+
+class LuxembourgTest extends FeatureTest
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
+    public function test_validation_behaviour(): void
+    {
+        $this->expectException(RuntimeException::class);
+
+        Socrates::validateId('1983046783', 'LU');
+    }
+
+    public function test_extract_behaviour(): void
+    {
+        $this->expectException(UnsupportedOperationException::class);
+
+        Socrates::getCitizenDataFromId('1983046783', 'LU');
+    }
+}
diff --git a/tests/Feature/MoldovaTest.php b/tests/Feature/Europe/MoldovaTest.php
similarity index 88%
rename from tests/Feature/MoldovaTest.php
rename to tests/Feature/Europe/MoldovaTest.php
index 7cb7d5c..4f06180 100644
--- a/tests/Feature/MoldovaTest.php
+++ b/tests/Feature/Europe/MoldovaTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Exceptions\UnsupportedOperationException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class MoldovaTest extends FeatureTest
 {
@@ -40,13 +41,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->validIds as $id) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($id, 'MD')
             );
         }
 
         foreach ($this->invalidIds as $id) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($id, 'MD')
             );
         }
diff --git a/tests/Feature/MontenegroTest.php b/tests/Feature/Europe/MontenegroTest.php
similarity index 63%
rename from tests/Feature/MontenegroTest.php
rename to tests/Feature/Europe/MontenegroTest.php
index 57df4fc..fda622d 100644
--- a/tests/Feature/MontenegroTest.php
+++ b/tests/Feature/Europe/MontenegroTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class MontenegroTest extends FeatureTest
 {
@@ -20,37 +22,37 @@ protected function setUp(): void
             'Crnoje' => [
                 'jmbg' => '2106941231195',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1941-06-21'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1941-06-21')->age,
-                'pob' => 'Budva, Kotor, Tivat - Montenegro'
+                'dob' => new DateTime('1941-06-21'),
+                'age' => $this->calculateAge(new DateTime('1941-06-21')),
+                'pob' => 'Budva, Kotor, Tivat - Montenegro',
             ],
             'Blažo' => [
                 'jmbg' => '1502945264054',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1945-02-15'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1945-02-15')->age,
-                'pob' => 'Nikšić, Plužine, Šavnik - Montenegro'
+                'dob' => new DateTime('1945-02-15'),
+                'age' => $this->calculateAge(new DateTime('1945-02-15')),
+                'pob' => 'Nikšić, Plužine, Šavnik - Montenegro',
             ],
             'Diko' => [
                 'jmbg' => '2007950274591',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1950-07-20'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1950-07-20')->age,
-                'pob' => 'Berane, Rožaje, Plav, Andrijevica - Montenegro'
+                'dob' => new DateTime('1950-07-20'),
+                'age' => $this->calculateAge(new DateTime('1950-07-20')),
+                'pob' => 'Berane, Rožaje, Plav, Andrijevica - Montenegro',
             ],
             'Ema' => [
                 'jmbg' => '1302953216612',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1953-02-13'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1953-02-13')->age,
-                'pob' => 'Podgorica, Danilovgrad, Kolašin - Montenegro'
+                'dob' => new DateTime('1953-02-13'),
+                'age' => $this->calculateAge(new DateTime('1953-02-13')),
+                'pob' => 'Podgorica, Danilovgrad, Kolašin - Montenegro',
             ],
             'Draginja' => [
                 'jmbg' => '0204942275271',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1942-04-02'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1942-04-02')->age,
-                'pob' => 'Berane, Rožaje, Plav, Andrijevica - Montenegro'
+                'dob' => new DateTime('1942-04-02'),
+                'age' => $this->calculateAge(new DateTime('1942-04-02')),
+                'pob' => 'Berane, Rožaje, Plav, Andrijevica - Montenegro',
             ],
         ];
 
@@ -68,10 +70,11 @@ public function test_extract_behaviour(): void
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['jmbg'], 'ME');
 
-            $this->assertEquals($person['gender'], $citizen->getGender());
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
-            $this->assertEquals($person['pob'], $citizen->getPlaceOfBirth());
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals($person['pob'], $citizen->getPlaceOfBirth());
         }
 
         $this->expectException(InvalidLengthException::class);
@@ -82,13 +85,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['jmbg'], 'ME')
             );
         }
 
         foreach ($this->invalidIds as $jmbg) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($jmbg, 'ME')
             );
         }
diff --git a/tests/Feature/NetherlandsTest.php b/tests/Feature/Europe/NetherlandsTest.php
similarity index 88%
rename from tests/Feature/NetherlandsTest.php
rename to tests/Feature/Europe/NetherlandsTest.php
index 083daa7..18bb100 100644
--- a/tests/Feature/NetherlandsTest.php
+++ b/tests/Feature/Europe/NetherlandsTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Exceptions\UnsupportedOperationException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class NetherlandsTest extends FeatureTest
 {
@@ -42,13 +43,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->validIds as $id) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($id, 'NL')
             );
         }
 
         foreach ($this->invalidIds as $id) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($id, 'NL')
             );
         }
diff --git a/tests/Feature/NorthMacedoniaTest.php b/tests/Feature/Europe/NorthMacedoniaTest.php
similarity index 57%
rename from tests/Feature/NorthMacedoniaTest.php
rename to tests/Feature/Europe/NorthMacedoniaTest.php
index dddef91..8cae981 100644
--- a/tests/Feature/NorthMacedoniaTest.php
+++ b/tests/Feature/Europe/NorthMacedoniaTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class NorthMacedoniaTest extends FeatureTest
 {
@@ -20,37 +22,37 @@ protected function setUp(): void
             'Marko' => [
                 'jmbg' => '2408944448442',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1944-08-24'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1944-08-24')->age,
-                'pob' => 'Prilep - North Macedonia'
+                'dob' => new DateTime('1944-08-24'),
+                'age' => $this->calculateAge(new DateTime('1944-08-24')),
+                'pob' => 'Prilep - North Macedonia',
             ],
             'Stefan' => [
                 'jmbg' => '0705957463421',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1957-05-07'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1957-05-07')->age,
-                'pob' => 'Strumica - North Macedonia'
+                'dob' => new DateTime('1957-05-07'),
+                'age' => $this->calculateAge(new DateTime('1957-05-07')),
+                'pob' => 'Strumica - North Macedonia',
             ],
             'Amyntas' => [
                 'jmbg' => '1610936414199',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1936-10-16'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1936-10-16')->age,
-                'pob' => 'Bitola - North Macedonia'
+                'dob' => new DateTime('1936-10-16'),
+                'age' => $this->calculateAge(new DateTime('1936-10-16')),
+                'pob' => 'Bitola - North Macedonia',
             ],
             'Dimitrov' => [
                 'jmbg' => '1207942491481',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1942-07-12'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1942-07-12')->age,
-                'pob' => 'Štip - North Macedonia'
+                'dob' => new DateTime('1942-07-12'),
+                'age' => $this->calculateAge(new DateTime('1942-07-12')),
+                'pob' => 'Štip - North Macedonia',
             ],
             'Kleitus' => [
                 'jmbg' => '2808928401264',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1928-08-28'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1928-08-28')->age,
-                'pob' => 'North Macedonia'
+                'dob' => new DateTime('1928-08-28'),
+                'age' => $this->calculateAge(new DateTime('1928-08-28')),
+                'pob' => 'North Macedonia',
             ]
         ];
 
@@ -68,10 +70,11 @@ public function test_extract_behaviour(): void
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['jmbg'], 'MK');
 
-            $this->assertEquals($person['gender'], $citizen->getGender());
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
-            $this->assertEquals($person['pob'], $citizen->getPlaceOfBirth());
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals($person['pob'], $citizen->getPlaceOfBirth());
         }
 
         $this->expectException(InvalidLengthException::class);
@@ -82,13 +85,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['jmbg'], 'MK')
             );
         }
 
         foreach ($this->invalidIds as $jmbg) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($jmbg, 'MK')
             );
         }
diff --git a/tests/Feature/NorwayTest.php b/tests/Feature/Europe/NorwayTest.php
similarity index 62%
rename from tests/Feature/NorwayTest.php
rename to tests/Feature/Europe/NorwayTest.php
index 10ed992..cac9fb4 100644
--- a/tests/Feature/NorwayTest.php
+++ b/tests/Feature/Europe/NorwayTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class NorwayTest extends FeatureTest
 {
@@ -20,32 +22,32 @@ protected function setUp(): void
             'kristoffer' => [
                 'fn' => '05080176785',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2001-08-05'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2001-08-05')->age,
+                'dob' => new DateTime('2001-08-05'),
+                'age' => $this->calculateAge(new DateTime('2001-08-05')),
             ],
             'astrid' => [
                 'fn' => '20050761232',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2007-05-20'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2007-05-20')->age,
+                'dob' => new DateTime('2007-05-20'),
+                'age' => $this->calculateAge(new DateTime('2007-05-20')),
             ],
             'linn' => [
                 'fn' => '28094949248',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1949-09-28'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1949-09-28')->age,
+                'dob' => new DateTime('1949-09-28'),
+                'age' => $this->calculateAge(new DateTime('1949-09-28')),
             ],
             'terje' => [
                 'fn' => '14019513913',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1995-01-14'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1995-01-14')->age,
+                'dob' => new DateTime('1995-01-14'),
+                'age' => $this->calculateAge(new DateTime('1995-01-14')),
             ],
             'heidi' => [
                 'fn' => '01090749036',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1907-09-01'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1907-09-01')->age,
+                'dob' => new DateTime('1907-09-01'),
+                'age' => $this->calculateAge(new DateTime('1907-09-01')),
             ],
         ];
 
@@ -63,9 +65,10 @@ public function test_extract_behaviour(): void
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['fn'], 'NO');
 
-            $this->assertEquals($person['gender'], $citizen->getGender());
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
         }
 
         $this->expectException(InvalidLengthException::class);
@@ -76,13 +79,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['fn'], 'NO')
             );
         }
 
         foreach ($this->invalidIds as $fn) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($fn, 'NO')
             );
         }
diff --git a/tests/Feature/PolandTest.php b/tests/Feature/Europe/PolandTest.php
similarity index 63%
rename from tests/Feature/PolandTest.php
rename to tests/Feature/Europe/PolandTest.php
index 350ab33..f529ca6 100644
--- a/tests/Feature/PolandTest.php
+++ b/tests/Feature/Europe/PolandTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class PolandTest extends FeatureTest
 {
@@ -20,32 +22,32 @@ protected function setUp(): void
             'Alesky' => [
                 'pesel' => '91072592137',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1991-07-25'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1991-07-25')->age,
+                'dob' => new DateTime('1991-07-25'),
+                'age' => $this->calculateAge(new DateTime('1991-07-25')),
             ],
             'Adelajda' => [
                 'pesel' => '02220826789',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2002-02-08'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2002-02-08')->age,
+                'dob' => new DateTime('2002-02-08'),
+                'age' => $this->calculateAge(new DateTime('2002-02-08')),
             ],
             'Izolda' => [
                 'pesel' => '87050832348',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1987-05-08'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1987-05-08')->age,
+                'dob' => new DateTime('1987-05-08'),
+                'age' => $this->calculateAge(new DateTime('1987-05-08')),
             ],
             'Klaudiusz' => [
                 'pesel' => '87012962775',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1987-01-29'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1987-01-29')->age,
+                'dob' => new DateTime('1987-01-29'),
+                'age' => $this->calculateAge(new DateTime('1987-01-29')),
             ],
             'Fryderyk' => [
                 'pesel' => '64032906019',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1964-03-29'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1964-03-29')->age,
+                'dob' => new DateTime('1964-03-29'),
+                'age' => $this->calculateAge(new DateTime('1964-03-29')),
             ],
         ];
 
@@ -62,9 +64,10 @@ public function test_extract_behaviour(): void
     {
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['pesel'], 'PL');
-            $this->assertEquals($person['gender'], $citizen->getGender());
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
         }
 
         $this->expectException(InvalidLengthException::class);
@@ -75,13 +78,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['pesel'], 'PL')
             );
         }
 
         foreach ($this->invalidIds as $pesel) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($pesel, 'PL')
             );
         }
diff --git a/tests/Feature/PortugalTest.php b/tests/Feature/Europe/PortugalTest.php
similarity index 89%
rename from tests/Feature/PortugalTest.php
rename to tests/Feature/Europe/PortugalTest.php
index bc35ab2..a3ac17e 100644
--- a/tests/Feature/PortugalTest.php
+++ b/tests/Feature/Europe/PortugalTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Exceptions\UnsupportedOperationException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class PortugalTest extends FeatureTest
 {
@@ -42,13 +43,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->validIds as $id) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($id, 'PT')
             );
         }
 
         foreach ($this->invalidIds as $invalidId) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($invalidId, 'PT')
             );
         }
diff --git a/tests/Feature/RomaniaTest.php b/tests/Feature/Europe/RomaniaTest.php
similarity index 64%
rename from tests/Feature/RomaniaTest.php
rename to tests/Feature/Europe/RomaniaTest.php
index fe692ca..301bfea 100644
--- a/tests/Feature/RomaniaTest.php
+++ b/tests/Feature/Europe/RomaniaTest.php
@@ -1,16 +1,17 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class RomaniaTest extends FeatureTest
 {
     private $people;
-
     private $invalidIds;
 
     public function setUp(): void
@@ -21,36 +22,36 @@ public function setUp(): void
             'alexandra' => [
                 'cnp' => '2931213173842',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1993-12-13'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1993-12-13')->age,
+                'dob' => new DateTime('1993-12-13'),
+                'age' => $this->calculateAge(new DateTime('1993-12-13')),
                 'pob' => 'Galati'
             ],
             'andrei' => [
                 'cnp' => '1941003395747',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1994-10-03'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1994-10-03')->age,
+                'dob' => new DateTime('1994-10-03'),
+                'age' => $this->calculateAge(new DateTime('1994-10-03')),
                 'pob' => 'Vrancea'
             ],
             'elena' => [
                 'cnp' => '2870917211577',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1987-09-17'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1987-09-17')->age,
+                'dob' => new DateTime('1987-09-17'),
+                'age' => $this->calculateAge(new DateTime('1987-09-17')),
                 'pob' => 'Ialomita'
             ],
             'florin' => [
                 'cnp' => '1850327466200',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1985-03-27'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1985-03-27')->age,
+                'dob' => new DateTime('1985-03-27'),
+                'age' => $this->calculateAge(new DateTime('1985-03-27')),
                 'pob' => 'Bucuresti Sectorul 6'
             ],
             'mihai' => [
                 'cnp' => '5010318045469',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2001-03-18'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2001-03-18')->age,
+                'dob' => new DateTime('2001-03-18'),
+                'age' => $this->calculateAge(new DateTime('2001-03-18')),
                 'pob' => 'Bacau'
             ]
         ];
@@ -68,10 +69,11 @@ public function test_extract_behaviour(): void
     {
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['cnp'], 'RO');
-            $this->assertEquals($person['gender'], $citizen->getGender());
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
-            $this->assertEquals($person['pob'], $citizen->getPlaceOfBirth());
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals($person['pob'], $citizen->getPlaceOfBirth());
         }
 
         $this->expectException(InvalidLengthException::class);
@@ -82,13 +84,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['cnp'], 'RO')
             );
         }
 
         foreach ($this->invalidIds as $cnp) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($cnp, 'RO')
             );
         }
diff --git a/tests/Feature/SerbiaTest.php b/tests/Feature/Europe/SerbiaTest.php
similarity index 63%
rename from tests/Feature/SerbiaTest.php
rename to tests/Feature/Europe/SerbiaTest.php
index b1cac48..1bc3537 100644
--- a/tests/Feature/SerbiaTest.php
+++ b/tests/Feature/Europe/SerbiaTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class SerbiaTest extends FeatureTest
 {
@@ -20,37 +22,37 @@ protected function setUp(): void
             'Nikola' => [
                 'jmbg' => '0101100710006',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2100-01-01'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2100-01-01')->age,
-                'pob' => 'Belgrade region (City of Belgrade) - Central Serbia'
+                'dob' => new DateTime('2100-01-01'),
+                'age' => $this->calculateAge(new DateTime('2100-01-01')),
+                'pob' => 'Belgrade region (City of Belgrade) - Central Serbia',
             ],
             'Miloje' => [
                 'jmbg' => '0110951074616',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1951-10-01'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1951-10-01')->age,
-                'pob' => 'foreigners in Serbian province of Vojvodina'
+                'dob' => new DateTime('1951-10-01'),
+                'age' => $this->calculateAge(new DateTime('1951-10-01')),
+                'pob' => 'foreigners in Serbian province of Vojvodina',
             ],
             'Teodora' => [
                 'jmbg' => '2702937737434',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1937-02-27'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1937-02-27')->age,
-                'pob' => 'Niš region (Nišava District, Pirot District and Toplica District) - Central Serbia'
+                'dob' => new DateTime('1937-02-27'),
+                'age' => $this->calculateAge(new DateTime('1937-02-27')),
+                'pob' => 'Niš region (Nišava District, Pirot District and Toplica District) - Central Serbia',
             ],
             'Jana' => [
                 'jmbg' => '2606936778324',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1936-06-26'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1936-06-26')->age,
-                'pob' => 'Podrinje and Kolubara regions (Mačva District and Kolubara District) - Central Serbia'
+                'dob' => new DateTime('1936-06-26'),
+                'age' => $this->calculateAge(new DateTime('1936-06-26')),
+                'pob' => 'Podrinje and Kolubara regions (Mačva District and Kolubara District) - Central Serbia',
             ],
             'Petra' => [
                 'jmbg' => '1209992745266',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1992-09-12'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1992-09-12')->age,
-                'pob' => 'Southern Morava region (Jablanica District and Pčinja District) - Central Serbia'
+                'dob' => new DateTime('1992-09-12'),
+                'age' => $this->calculateAge(new DateTime('1992-09-12')),
+                'pob' => 'Southern Morava region (Jablanica District and Pčinja District) - Central Serbia',
             ]
         ];
 
@@ -68,10 +70,11 @@ public function test_extract_behaviour(): void
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['jmbg'], 'RS');
 
-            $this->assertEquals($person['gender'], $citizen->getGender());
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
-            $this->assertEquals($person['pob'], $citizen->getPlaceOfBirth());
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals($person['pob'], $citizen->getPlaceOfBirth());
         }
 
         $this->expectException(InvalidLengthException::class);
@@ -82,13 +85,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['jmbg'], 'RS')
             );
         }
 
         foreach ($this->invalidIds as $jmbg) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($jmbg, 'RS')
             );
         }
diff --git a/tests/Feature/SlovakiaTest.php b/tests/Feature/Europe/SlovakiaTest.php
similarity index 61%
rename from tests/Feature/SlovakiaTest.php
rename to tests/Feature/Europe/SlovakiaTest.php
index 161970b..a37dba1 100644
--- a/tests/Feature/SlovakiaTest.php
+++ b/tests/Feature/Europe/SlovakiaTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class SlovakiaTest extends FeatureTest
 {
@@ -20,32 +22,32 @@ protected function setUp(): void
             'Boris' => [
                 'rc' => '931027/3951',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1993-10-27'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1993-10-27')->age,
+                'dob' => new DateTime('1993-10-27'),
+                'age' => $this->calculateAge(new DateTime('1993-10-27')),
             ],
             'Miroslav' => [
                 'rc' => '000816/9733',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2000-08-16'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2000-08-16')->age,
+                'dob' => new DateTime('2000-08-16'),
+                'age' => $this->calculateAge(new DateTime('2000-08-16')),
             ],
             'Natalia' => [
                 'rc' => '015612/5552',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2001-06-12'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2001-06-12')->age,
+                'dob' => new DateTime('2001-06-12'),
+                'age' => $this->calculateAge(new DateTime('2001-06-12')),
             ],
             'Victoria' => [
                 'rc' => '935103/6189',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1993-01-03'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1993-01-03')->age,
+                'dob' => new DateTime('1993-01-03'),
+                'age' => $this->calculateAge(new DateTime('1993-01-03')),
             ],
             'Jožko' => [
                 'rc' => '010722/4634',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2001-07-22'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2001-07-22')->age,
+                'dob' => new DateTime('2001-07-22'),
+                'age' => $this->calculateAge(new DateTime('2001-07-22')),
             ],
         ];
 
@@ -63,9 +65,10 @@ public function test_extract_behaviour(): void
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['rc'], 'SK');
 
-            $this->assertEquals($person['gender'], $citizen->getGender());
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
         }
 
         $this->expectException(InvalidLengthException::class);
@@ -76,19 +79,19 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['rc'], 'SK')
             );
         }
 
         foreach ($this->invalidIds as $rc) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($rc, 'SK')
             );
         }
 
         $this->expectException(InvalidLengthException::class);
 
-        Socrates::validateId('88606/875', 'CZ');
+        Socrates::validateId('88606/875', 'SK');
     }
 }
diff --git a/tests/Feature/SloveniaTest.php b/tests/Feature/Europe/SloveniaTest.php
similarity index 58%
rename from tests/Feature/SloveniaTest.php
rename to tests/Feature/Europe/SloveniaTest.php
index 5b96971..576bdd8 100644
--- a/tests/Feature/SloveniaTest.php
+++ b/tests/Feature/Europe/SloveniaTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class SloveniaTest extends FeatureTest
 {
@@ -20,37 +22,37 @@ protected function setUp(): void
             'Luka' => [
                 'emso' => '0101006500006',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2006-01-01'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2006-01-01')->age,
-                'pob' => 'Slovenia'
+                'dob' => new DateTime('2006-01-01'),
+                'age' => $this->calculateAge(new DateTime('2006-01-01')),
+                'pob' => 'Slovenia',
             ],
             'Zoja' => [
                 'emso' => '0310933507830',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1933-10-03'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1933-10-03')->age,
-                'pob' => 'Slovenia'
+                'dob' => new DateTime('1933-10-03'),
+                'age' => $this->calculateAge(new DateTime('1933-10-03')),
+                'pob' => 'Slovenia',
             ],
             'Jaka' => [
                 'emso' => '1408984500257',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1984-08-14'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1984-08-14')->age,
-                'pob' => 'Slovenia'
+                'dob' => new DateTime('1984-08-14'),
+                'age' => $this->calculateAge(new DateTime('1984-08-14')),
+                'pob' => 'Slovenia',
             ],
             'Lana' => [
                 'emso' => '0205962509348',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1962-05-02'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1962-05-02')->age,
-                'pob' => 'Slovenia'
+                'dob' => new DateTime('1962-05-02'),
+                'age' => $this->calculateAge(new DateTime('1962-05-02')),
+                'pob' => 'Slovenia',
             ],
             'Mia' => [
                 'emso' => '1201962509788',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1962-01-12'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1962-01-12')->age,
-                'pob' => 'Slovenia'
+                'dob' => new DateTime('1962-01-12'),
+                'age' => $this->calculateAge(new DateTime('1962-01-12')),
+                'pob' => 'Slovenia',
             ],
         ];
 
@@ -68,10 +70,11 @@ public function test_extract_behaviour(): void
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['emso'], 'SI');
 
-            $this->assertEquals($person['gender'], $citizen->getGender());
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
-            $this->assertEquals($person['pob'], $citizen->getPlaceOfBirth());
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals($person['pob'], $citizen->getPlaceOfBirth());
         }
 
         $this->expectException(InvalidLengthException::class);
@@ -82,13 +85,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['emso'], 'SI')
             );
         }
 
         foreach ($this->invalidIds as $emso) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($emso, 'SI')
             );
         }
diff --git a/tests/Feature/SpainTest.php b/tests/Feature/Europe/SpainTest.php
similarity index 88%
rename from tests/Feature/SpainTest.php
rename to tests/Feature/Europe/SpainTest.php
index 5985efd..2c7d394 100644
--- a/tests/Feature/SpainTest.php
+++ b/tests/Feature/Europe/SpainTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Exceptions\UnsupportedOperationException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class SpainTest extends FeatureTest
 {
@@ -42,13 +43,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->validIds as $id) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($id, 'ES')
             );
         }
 
         foreach ($this->invalidIds as $invalidId) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($invalidId, 'ES')
             );
         }
diff --git a/tests/Feature/SwedenTest.php b/tests/Feature/Europe/SwedenTest.php
similarity index 63%
rename from tests/Feature/SwedenTest.php
rename to tests/Feature/Europe/SwedenTest.php
index ef7b0e0..53c592b 100644
--- a/tests/Feature/SwedenTest.php
+++ b/tests/Feature/Europe/SwedenTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class SwedenTest extends FeatureTest
 {
@@ -20,32 +22,32 @@ protected function setUp(): void
             'alexia' => [
                 'psn' => '550309-6447',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1955-03-09'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1955-03-09')->age,
+                'dob' => new DateTime('1955-03-09'),
+                'age' => $this->calculateAge(new DateTime('1955-03-09')),
             ],
             'otto' => [
                 'psn' => '001020-1895',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2000-10-20'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2000-10-20')->age,
+                'dob' => new DateTime('2000-10-20'),
+                'age' => $this->calculateAge(new DateTime('2000-10-20')),
             ],
             'lowa' => [
                 'psn' => '751208-0222',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1975-12-08'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1975-12-08')->age,
+                'dob' => new DateTime('1975-12-08'),
+                'age' => $this->calculateAge(new DateTime('1975-12-08')),
             ],
             'edward' => [
                 'psn' => '19771211-2775',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1977-12-11'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1977-12-11')->age,
+                'dob' => new DateTime('1977-12-11'),
+                'age' => $this->calculateAge(new DateTime('1977-12-11')),
             ],
             'maia' => [
                 'psn' => '380519-7807',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1938-05-19'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1938-05-19')->age,
+                'dob' => new DateTime('1938-05-19'),
+                'age' => $this->calculateAge(new DateTime('1938-05-19')),
             ],
         ];
 
@@ -63,9 +65,10 @@ public function test_extract_behaviour(): void
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['psn'], 'SE');
 
-            $this->assertEquals($person['gender'], $citizen->getGender());
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
         }
 
         $this->expectException(InvalidLengthException::class);
@@ -76,13 +79,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['psn'], 'SE')
             );
         }
 
         foreach ($this->invalidIds as $invalidId) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($invalidId, 'SE')
             );
         }
diff --git a/tests/Feature/SwitzerlandTest.php b/tests/Feature/Europe/SwitzerlandTest.php
similarity index 90%
rename from tests/Feature/SwitzerlandTest.php
rename to tests/Feature/Europe/SwitzerlandTest.php
index 163e381..70dea64 100644
--- a/tests/Feature/SwitzerlandTest.php
+++ b/tests/Feature/Europe/SwitzerlandTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Exceptions\UnsupportedOperationException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class SwitzerlandTest extends FeatureTest
 {
@@ -42,13 +43,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->validIds as $id) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($id, 'CH')
             );
         }
 
         foreach ($this->invalidIds as $invalidId) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($invalidId, 'CH')
             );
         }
diff --git a/tests/Feature/TurkeyTest.php b/tests/Feature/Europe/TurkeyTest.php
similarity index 89%
rename from tests/Feature/TurkeyTest.php
rename to tests/Feature/Europe/TurkeyTest.php
index d7b57d7..4d541f4 100644
--- a/tests/Feature/TurkeyTest.php
+++ b/tests/Feature/Europe/TurkeyTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Exceptions\UnsupportedOperationException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class TurkeyTest extends FeatureTest
 {
@@ -42,13 +43,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->validIds as $id) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($id, 'TR')
             );
         }
 
         foreach ($this->invalidIds as $invalidId) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($invalidId, 'TR')
             );
         }
diff --git a/tests/Feature/UkraineTest.php b/tests/Feature/Europe/UkraineTest.php
similarity index 62%
rename from tests/Feature/UkraineTest.php
rename to tests/Feature/Europe/UkraineTest.php
index 26c2433..cd5f59a 100644
--- a/tests/Feature/UkraineTest.php
+++ b/tests/Feature/Europe/UkraineTest.php
@@ -1,11 +1,13 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Carbon\Carbon;
+use DateTime;
 use Reducktion\Socrates\Constants\Gender;
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class UkraineTest extends FeatureTest
 {
@@ -20,32 +22,32 @@ protected function setUp(): void
             'petro' => [
                 'id' => '4031090675',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2010-05-13'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2010-05-13')->age
+                'dob' => new DateTime('2010-05-13'),
+                'age' => $this->calculateAge(new DateTime('2010-05-13')),
             ],
             'vadym' => [
                 'id' => '3292197434',
                 'gender' => Gender::MALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1990-02-18'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1990-02-18')->age
+                'dob' => new DateTime('1990-02-18'),
+                'age' => $this->calculateAge(new DateTime('1990-02-18')),
             ],
             'veronika' => [
                 'id' => '2023599602',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '1955-05-27'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1955-05-27')->age
+                'dob' => new DateTime('1955-05-27'),
+                'age' => $this->calculateAge(new DateTime('1955-05-27')),
             ],
             'ruslana' => [
                 'id' => '4247134484',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2016-04-12'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2016-04-12')->age
+                'dob' => new DateTime('2016-04-12'),
+                'age' => $this->calculateAge(new DateTime('2016-04-12')),
             ],
             'zoya' => [
                 'id' => '3771509002',
                 'gender' => Gender::FEMALE,
-                'dob' => Carbon::createFromFormat('Y-m-d', '2003-04-05'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2003-04-05')->age
+                'dob' => new DateTime('2003-04-05'),
+                'age' => $this->calculateAge(new DateTime('2003-04-05')),
             ]
         ];
 
@@ -63,9 +65,10 @@ public function test_extract_behaviour(): void
         foreach ($this->people as $person) {
             $citizen = Socrates::getCitizenDataFromId($person['id'], 'UA');
 
-            $this->assertEquals($person['gender'], $citizen->getGender());
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
         }
 
         $this->expectException(InvalidLengthException::class);
@@ -76,13 +79,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->people as $person) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($person['id'], 'UA')
             );
         }
 
         foreach ($this->invalidIds as $id) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($id, 'UA')
             );
         }
diff --git a/tests/Feature/UnitedKingdomTest.php b/tests/Feature/Europe/UnitedKingdomTest.php
similarity index 90%
rename from tests/Feature/UnitedKingdomTest.php
rename to tests/Feature/Europe/UnitedKingdomTest.php
index c71ff95..eb9cb27 100644
--- a/tests/Feature/UnitedKingdomTest.php
+++ b/tests/Feature/Europe/UnitedKingdomTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\Europe;
 
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Exceptions\UnsupportedOperationException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class UnitedKingdomTest extends FeatureTest
 {
@@ -51,13 +52,13 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->validIds as $id) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($id, 'GB')
             );
         }
 
         foreach ($this->invalidIds as $invalidId) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($invalidId, 'GB')
             );
         }
diff --git a/tests/Feature/FeatureTest.php b/tests/Feature/FeatureTest.php
index 2d30d6b..1298408 100644
--- a/tests/Feature/FeatureTest.php
+++ b/tests/Feature/FeatureTest.php
@@ -2,6 +2,7 @@
 
 namespace Reducktion\Socrates\Tests\Feature;
 
+use DateTime;
 use Reducktion\Socrates\Tests\TestCase;
 
 abstract class FeatureTest extends TestCase
@@ -9,4 +10,9 @@ abstract class FeatureTest extends TestCase
     abstract public function test_extract_behaviour(): void;
 
     abstract public function test_validation_behaviour(): void;
+
+    public function calculateAge(DateTime $dateOfBirth): int
+    {
+        return (new DateTime())->diff($dateOfBirth)->y;
+    }
 }
diff --git a/tests/Feature/LuxembourgTest.php b/tests/Feature/LuxembourgTest.php
deleted file mode 100644
index 3133b8a..0000000
--- a/tests/Feature/LuxembourgTest.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-namespace Reducktion\Socrates\Tests\Feature;
-
-use Carbon\Carbon;
-use Reducktion\Socrates\Laravel\Facades\Socrates;
-use Reducktion\Socrates\Exceptions\InvalidLengthException;
-
-class LuxembourgTest extends FeatureTest
-{
-    private $people;
-    private $invalidIds;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->people = [
-            'Gabriel' => [
-                'nin' => '1983081246783',
-                'dob' => Carbon::createFromFormat('Y-m-d', '1983-08-12'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1983-08-12')->age,
-            ],
-            'Emma' => [
-                'nin' => '2003042581931',
-                'dob' => Carbon::createFromFormat('Y-m-d', '2003-04-25'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2003-04-25')->age,
-            ],
-            'Leo' => [
-                'nin' => '1971110258746',
-                'dob' => Carbon::createFromFormat('Y-m-d', '1971-11-02'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1971-11-02')->age,
-            ],
-            'Lara' => [
-                'nin' => '2012051469336',
-                'dob' => Carbon::createFromFormat('Y-m-d', '2012-05-14'),
-                'age' => Carbon::createFromFormat('Y-m-d', '2012-05-14')->age,
-            ],
-            'Noah' => [
-                'nin' => '1994092874551',
-                'dob' => Carbon::createFromFormat('Y-m-d', '1994-09-28'),
-                'age' => Carbon::createFromFormat('Y-m-d', '1994-09-28')->age,
-            ],
-        ];
-
-        $this->invalidIds = [
-            '1994789587182',
-            '5971654782313',
-            '2055101054879',
-            '1997053045687',
-            '2001111123654',
-        ];
-    }
-
-    public function test_extract_behaviour(): void
-    {
-        foreach ($this->people as $person) {
-            $citizen = Socrates::getCitizenDataFromId($person['nin'], 'LU');
-            $this->assertEquals($person['dob'], $citizen->getDateOfBirth());
-            $this->assertEquals($person['age'], $citizen->getAge());
-        }
-
-        $this->expectException(InvalidLengthException::class);
-
-        Socrates::getCitizenDataFromId('1983046783', 'LU');
-    }
-
-    public function test_validation_behaviour(): void
-    {
-        foreach ($this->people as $person) {
-            $this->assertTrue(
-                Socrates::validateId($person['nin'], 'LU')
-            );
-        }
-
-        foreach ($this->invalidIds as $nin) {
-            $this->assertFalse(
-                Socrates::validateId($nin, 'LU')
-            );
-        }
-
-        $this->expectException(InvalidLengthException::class);
-
-        Socrates::validateId('1983046783', 'LU');
-    }
-}
diff --git a/tests/Feature/NorthAmerica/CanadaTest.php b/tests/Feature/NorthAmerica/CanadaTest.php
new file mode 100644
index 0000000..ddc0bf9
--- /dev/null
+++ b/tests/Feature/NorthAmerica/CanadaTest.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Reducktion\Socrates\Tests\Feature\NorthAmerica;
+
+use Reducktion\Socrates\Exceptions\InvalidLengthException;
+use Reducktion\Socrates\Exceptions\UnsupportedOperationException;
+use Reducktion\Socrates\Laravel\Facades\Socrates;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
+
+class CanadaTest extends FeatureTest
+{
+    private $validIds;
+    private $invalidIds;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->validIds = [
+            '046 454 286',
+            '671 143 899',
+            '002 371 920',
+            '501 343 719',
+            '912 046 737',
+        ];
+
+        $this->invalidIds = [
+            '512 917 638',
+            '322 710 094',
+            '761 999 512',
+            '061 003 528',
+            '654 789 093',
+        ];
+    }
+
+    public function test_extract_behaviour(): void
+    {
+        $this->expectException(UnsupportedOperationException::class);
+
+        Socrates::getCitizenDataFromId('85 712 123', 'CA');
+    }
+
+    public function test_validation_behaviour(): void
+    {
+        foreach ($this->validIds as $id) {
+            self::assertTrue(
+                Socrates::validateId($id, 'CA')
+            );
+        }
+
+        foreach ($this->invalidIds as $invalidId) {
+            self::assertFalse(
+                Socrates::validateId($invalidId, 'CA')
+            );
+        }
+
+        $this->expectException(InvalidLengthException::class);
+
+        Socrates::validateId('781 211 2231', 'CA');
+    }
+}
diff --git a/tests/Feature/NorthAmerica/MexicoTest.php b/tests/Feature/NorthAmerica/MexicoTest.php
new file mode 100644
index 0000000..f63d30e
--- /dev/null
+++ b/tests/Feature/NorthAmerica/MexicoTest.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace Reducktion\Socrates\Tests\Feature\NorthAmerica;
+
+use Carbon\Carbon;
+use DateTime;
+use Reducktion\Socrates\Constants\Gender;
+use Reducktion\Socrates\Laravel\Facades\Socrates;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
+use Reducktion\Socrates\Exceptions\InvalidLengthException;
+
+class MexicoTest extends FeatureTest
+{
+    private $validIds;
+    private $invalidIds;
+    private $people;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->people = [
+            'juan' => [
+                'curp' => 'MAAR790213HMNRLF03',
+                'gender' => Gender::MALE,
+                'dob' => new DateTime('1979-2-13'),
+                'age' => $this->calculateAge(new DateTime('1979-2-13')),
+            ],
+            'letitia' => [
+                'curp' => 'HEGG560427MVZRRL04',
+                'gender' => Gender::FEMALE,
+                'dob' => new DateTime('1956-4-27'),
+                'age' => $this->calculateAge(new DateTime('1956-4-27')),
+            ],
+            'augustin' => [
+                'curp' => 'BOXW010820HNERXNA1',
+                'gender' => Gender::MALE,
+                'dob' => new DateTime('2001-8-20'),
+                'age' => $this->calculateAge(new DateTime('2001-8-20')),
+            ],
+            'diego' => [
+                'curp' => 'TUAZ080213HMNRLFA3',
+                'gender' => Gender::MALE,
+                'dob' => new DateTime('2008-2-13'),
+                'age' => $this->calculateAge(new DateTime('2008-2-13')),
+            ],
+        ];
+
+        $this->validIds = [
+            'MAAR790213HMNRLF03',
+            'HEGG560427MVZRRL04',
+            'BOXW310820HNERXN09',
+            'TUAZ790213HMNRLF02',
+            'TUAZ040213MCLRLFA7',
+            'JIAZ040213MCLRLFA6',
+            'XOAZ980927MCLRLFA6',
+        ];
+
+        $this->invalidIds = [
+            '1AAR790213HMNRLF03',
+            'MRAR790213HMNRLF03',
+            'MAARA90213HMNRLF03',
+            'MAAR7A0213HMNRLF03',
+            'MAAR79A213HMNRLF03',
+            'MAAR790A13HMNRLF03',
+            'MAAR7902A3HMNRLF03',
+            'MAAR79021AHMNRLF03',
+            'MRAR791313HMNRLF03',
+            'MRAR791332HMNRLF03',
+            'MRAR7913321MNRLF03',
+            'MRAR791332AMNRLF03',
+            'MRAR7902131MNRLF03',
+            'MRAR790213ZMNRLF03',
+            'MAAR790213HZORLF03',
+            'MAAR790213HZ1RLF03',
+            'MAAR790213HMNRLF04',
+            'MAAR790213HMNRLF0A',
+        ];
+    }
+
+    public function test_extract_behaviour(): void
+    {
+        foreach ($this->people as $person) {
+            $citizen = Socrates::getCitizenDataFromId($person['curp'], 'MX');
+
+            self::assertEquals($person['gender'], $citizen->getGender());
+            self::assertEquals(Carbon::instance($person['dob']), $citizen->getDateOfBirth());
+            self::assertEquals($person['dob'], $citizen->getDateOfBirthNative());
+            self::assertEquals($person['age'], $citizen->getAge());
+        }
+
+        $this->expectException(InvalidLengthException::class);
+
+        Socrates::getCitizenDataFromId('69218938062', 'MX');
+    }
+
+    public function test_validation_behaviour(): void
+    {
+        foreach ($this->validIds as $id) {
+            self::assertTrue(
+                Socrates::validateId($id, 'MX')
+            );
+        }
+
+        foreach ($this->invalidIds as $invalidId) {
+            self::assertFalse(
+                Socrates::validateId($invalidId, 'MX')
+            );
+        }
+
+        $this->expectException(InvalidLengthException::class);
+
+        Socrates::validateId('1621543419643', 'MX');
+    }
+}
diff --git a/tests/Feature/NorthAmerica/UnitedStatesTest.php b/tests/Feature/NorthAmerica/UnitedStatesTest.php
new file mode 100644
index 0000000..9649951
--- /dev/null
+++ b/tests/Feature/NorthAmerica/UnitedStatesTest.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Reducktion\Socrates\Tests\Feature\NorthAmerica;
+
+use Reducktion\Socrates\Exceptions\InvalidLengthException;
+use Reducktion\Socrates\Exceptions\UnsupportedOperationException;
+use Reducktion\Socrates\Laravel\Facades\Socrates;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
+
+class UnitedStatesTest extends FeatureTest
+{
+    private $validIds;
+    private $invalidIds;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->validIds = [
+            '167-38-1265',
+            '536-22-8726',
+            '536-22-5232',
+            '574-22-7664',
+            '671-26-9121'
+        ];
+
+        $this->invalidIds = [
+            '078-05-1120',
+            '219-09-9999',
+            '457-55-5462',
+            '666-91-8271',
+            '000-12-7652',
+            '167-00-6321',
+            '167-11-0000',
+            '981-76-1521',
+        ];
+    }
+
+    public function test_extract_behaviour(): void
+    {
+        $this->expectException(UnsupportedOperationException::class);
+
+        Socrates::getCitizenDataFromId('145565258ZZY', 'US');
+    }
+
+    public function test_validation_behaviour(): void
+    {
+        foreach ($this->validIds as $id) {
+            self::assertTrue(
+                Socrates::validateId($id, 'US')
+            );
+        }
+
+        foreach ($this->invalidIds as $invalidId) {
+            self::assertFalse(
+                Socrates::validateId($invalidId, 'US')
+            );
+        }
+
+        $this->expectException(InvalidLengthException::class);
+
+        Socrates::validateId('11084129 8 ZX', 'US');
+    }
+}
diff --git a/tests/Feature/SouthAmerica/ArgentinaTest.php b/tests/Feature/SouthAmerica/ArgentinaTest.php
new file mode 100644
index 0000000..a8894a8
--- /dev/null
+++ b/tests/Feature/SouthAmerica/ArgentinaTest.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Reducktion\Socrates\Tests\Feature\SouthAmerica;
+
+use Reducktion\Socrates\Laravel\Facades\Socrates;
+use Reducktion\Socrates\Exceptions\InvalidLengthException;
+use Reducktion\Socrates\Exceptions\UnsupportedOperationException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
+
+class ArgentinaTest extends FeatureTest
+{
+    private $validIds;
+    private $invalidIds;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->validIds = [
+            '20319731467',
+            '23129006544',
+            '20385823631',
+            '20123456786',
+            '33711146259',
+            '30716762145',
+            '30629357552',
+            '27061822238',
+            '20028314788',
+            '23010852064',
+            '27083496970',
+        ];
+
+        $this->invalidIds = [
+            '42319731467',
+            '20999999997',
+            '20349735981',
+            '20123456785',
+            '30010852064',
+        ];
+    }
+
+    public function test_extract_behaviour(): void
+    {
+        $this->expectException(UnsupportedOperationException::class);
+
+        Socrates::getCitizenDataFromId('', 'AR');
+    }
+
+    public function test_validation_behaviour(): void
+    {
+        foreach ($this->validIds as $id) {
+            self::assertTrue(
+                Socrates::validateId($id, 'AR'),
+                $id
+            );
+        }
+
+        foreach ($this->invalidIds as $id) {
+            self::assertFalse(
+                Socrates::validateId($id, 'AR')
+            );
+        }
+
+        $this->expectException(InvalidLengthException::class);
+
+        Socrates::validateId('123456', 'AR');
+    }
+}
diff --git a/tests/Feature/BrazilTest.php b/tests/Feature/SouthAmerica/BrazilTest.php
similarity index 91%
rename from tests/Feature/BrazilTest.php
rename to tests/Feature/SouthAmerica/BrazilTest.php
index ef066de..c7164b6 100644
--- a/tests/Feature/BrazilTest.php
+++ b/tests/Feature/SouthAmerica/BrazilTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Reducktion\Socrates\Tests\Feature;
+namespace Reducktion\Socrates\Tests\Feature\SouthAmerica;
 
 use Reducktion\Socrates\Laravel\Facades\Socrates;
 use Reducktion\Socrates\Exceptions\InvalidLengthException;
 use Reducktion\Socrates\Exceptions\UnsupportedOperationException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
 
 class BrazilTest extends FeatureTest
 {
@@ -65,14 +66,14 @@ public function test_extract_behaviour(): void
     public function test_validation_behaviour(): void
     {
         foreach ($this->validIds as $id) {
-            $this->assertTrue(
+            self::assertTrue(
                 Socrates::validateId($id, 'BR'),
                 $id
             );
         }
 
         foreach ($this->invalidIds as $id) {
-            $this->assertFalse(
+            self::assertFalse(
                 Socrates::validateId($id, 'BR')
             );
         }
diff --git a/tests/Feature/SouthAmerica/ChileTest.php b/tests/Feature/SouthAmerica/ChileTest.php
new file mode 100644
index 0000000..f2d2d07
--- /dev/null
+++ b/tests/Feature/SouthAmerica/ChileTest.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Reducktion\Socrates\Tests\Feature\SouthAmerica;
+
+use Reducktion\Socrates\Laravel\Facades\Socrates;
+use Reducktion\Socrates\Exceptions\InvalidLengthException;
+use Reducktion\Socrates\Exceptions\UnsupportedOperationException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
+
+class ChileTest extends FeatureTest
+{
+    private $validIds;
+    private $invalidIds;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->validIds = [
+            '19132031-K',
+            '5587600-2',
+            '22269631-3',
+            '11881570-K',
+            '12067530-3',
+            '14674646-2',
+            '14928530-K',
+            '22931750-4',
+            '5258230-K',
+            '11077954-2',
+            '30.686.957-4',
+        ];
+
+        $this->invalidIds = [
+            '19132031-k', //number valid but lower "k"
+            '11111112-9',
+            '55185352-8',
+            '19947727-K',
+            '12345689-2',
+            '11111111-L',
+            '22931750-K',
+        ];
+    }
+
+    public function test_extract_behaviour(): void
+    {
+        $this->expectException(UnsupportedOperationException::class);
+
+        Socrates::getCitizenDataFromId('', 'CL');
+    }
+
+    public function test_validation_behaviour(): void
+    {
+        foreach ($this->validIds as $id) {
+            self::assertTrue(
+                Socrates::validateId($id, 'CL'),
+                $id
+            );
+        }
+
+        foreach ($this->invalidIds as $id) {
+            self::assertFalse(
+                Socrates::validateId($id, 'CL')
+            );
+        }
+
+        $this->expectException(InvalidLengthException::class);
+
+        Socrates::validateId('1234567', 'CL');
+    }
+}
diff --git a/tests/Feature/SouthAmerica/EcuadorTest.php b/tests/Feature/SouthAmerica/EcuadorTest.php
new file mode 100644
index 0000000..d608e1b
--- /dev/null
+++ b/tests/Feature/SouthAmerica/EcuadorTest.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Reducktion\Socrates\Tests\Feature\SouthAmerica;
+
+use Reducktion\Socrates\Laravel\Facades\Socrates;
+use Reducktion\Socrates\Exceptions\InvalidLengthException;
+use Reducktion\Socrates\Exceptions\UnsupportedOperationException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
+
+class EcuadorTest extends FeatureTest
+{
+    private $validIds;
+    private $invalidIds;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->validIds = [
+            '0926687856',
+            '1159944279',
+            '0350442026',
+            '1930773021',
+            '2010123061',
+            '1710034065',
+        ];
+
+        $this->invalidIds = [
+            '1234567890',
+            '2510034065',
+            '1770034065',
+            '1570111029',
+            '0126987368',
+        ];
+    }
+
+    public function test_extract_behaviour(): void
+    {
+        $this->expectException(UnsupportedOperationException::class);
+
+        Socrates::getCitizenDataFromId('', 'EC');
+    }
+
+    public function test_validation_behaviour(): void
+    {
+        foreach ($this->validIds as $id) {
+            self::assertTrue(
+                Socrates::validateId($id, 'EC'),
+                $id
+            );
+        }
+
+        foreach ($this->invalidIds as $id) {
+            self::assertFalse(
+                Socrates::validateId($id, 'EC')
+            );
+        }
+
+        $this->expectException(InvalidLengthException::class);
+
+        Socrates::validateId('123456789', 'EC');
+    }
+}
diff --git a/tests/Feature/SouthAmerica/PeruTest.php b/tests/Feature/SouthAmerica/PeruTest.php
new file mode 100644
index 0000000..9387d63
--- /dev/null
+++ b/tests/Feature/SouthAmerica/PeruTest.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Reducktion\Socrates\Tests\Feature\SouthAmerica;
+
+use Reducktion\Socrates\Laravel\Facades\Socrates;
+use Reducktion\Socrates\Exceptions\InvalidLengthException;
+use Reducktion\Socrates\Exceptions\UnsupportedOperationException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
+
+class PeruTest extends FeatureTest
+{
+    private $validIds;
+    private $invalidIds;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->validIds = [
+            '447690450',
+            '858845624',
+            '09189667B',
+            '739184148',
+            '83015889H',
+            '178011460',
+            '101174102',
+            '43451826-7',
+            '10117410-G',
+            '06460698K',
+        ];
+
+        $this->invalidIds = [
+            '101174103',
+            '10117410H',
+            '178A11460',
+            '83015889B',
+            '09189667V',
+            '85884562D',
+            '55833222D',
+            '64708232D',
+            '64015292J',
+            '73918414W',
+        ];
+    }
+
+    public function test_extract_behaviour(): void
+    {
+        $this->expectException(UnsupportedOperationException::class);
+
+        Socrates::getCitizenDataFromId('', 'PE');
+    }
+
+    public function test_validation_behaviour(): void
+    {
+        foreach ($this->validIds as $id) {
+            self::assertTrue(
+                Socrates::validateId($id, 'PE'),
+                $id
+            );
+        }
+
+        foreach ($this->invalidIds as $id) {
+            self::assertFalse(
+                Socrates::validateId($id, 'PE')
+            );
+        }
+
+        $this->expectException(InvalidLengthException::class);
+
+        Socrates::validateId('1234567', 'PE');
+    }
+}
diff --git a/tests/Feature/SouthAmerica/UruguayTest.php b/tests/Feature/SouthAmerica/UruguayTest.php
new file mode 100644
index 0000000..48edc46
--- /dev/null
+++ b/tests/Feature/SouthAmerica/UruguayTest.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Reducktion\Socrates\Tests\Feature\SouthAmerica;
+
+use Reducktion\Socrates\Laravel\Facades\Socrates;
+use Reducktion\Socrates\Exceptions\InvalidLengthException;
+use Reducktion\Socrates\Exceptions\UnsupportedOperationException;
+use Reducktion\Socrates\Tests\Feature\FeatureTest;
+
+class UruguayTest extends FeatureTest
+{
+    private $validIds;
+    private $invalidIds;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->validIds = [
+            '9.814.898-7',
+            '99609297',
+            '7.019.519.6',
+            '2.797.689 6',
+            '24895354',
+            '40008026',
+            '60125711',
+            '11111111',
+            '22222222',
+            '52574582',
+            '96072455',
+            '70505244',
+        ];
+
+        $this->invalidIds = [
+            '46057422',
+            '90224632',
+            '52631437',
+            '62634608',
+            '23801966',
+            '27452675',
+            '32311266',
+            '94448560',
+            '59672227',
+            '28441574',
+            '11111112',
+        ];
+    }
+
+    public function test_extract_behaviour(): void
+    {
+        $this->expectException(UnsupportedOperationException::class);
+
+        Socrates::getCitizenDataFromId('', 'UY');
+    }
+
+    public function test_validation_behaviour(): void
+    {
+        foreach ($this->validIds as $id) {
+            self::assertTrue(
+                Socrates::validateId($id, 'UY'),
+                $id
+            );
+        }
+
+        foreach ($this->invalidIds as $id) {
+            self::assertFalse(
+                Socrates::validateId($id, 'UY')
+            );
+        }
+
+        $this->expectException(InvalidLengthException::class);
+
+        Socrates::validateId('1234567', 'UY');
+    }
+}
diff --git a/tests/IdValidatorFactoryTest.php b/tests/IdValidatorFactoryTest.php
new file mode 100644
index 0000000..24f289f
--- /dev/null
+++ b/tests/IdValidatorFactoryTest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Reducktion\Socrates\Tests;
+
+use Reducktion\Socrates\Contracts\IdValidator;
+use Reducktion\Socrates\Core\IdValidatorFactory;
+use RuntimeException;
+
+class IdValidatorFactoryTest extends TestCase
+{
+    /** @test */
+    public function it_gets_validator(): void
+    {
+        $validator = IdValidatorFactory::getValidator('FI');
+        $this->assertInstanceOf(IdValidator::class, $validator);
+    }
+
+    /** @test */
+    public function it_throws_for_unknown_country(): void
+    {
+        $this->expectException(RuntimeException::class);
+        IdValidatorFactory::getValidator('XX');
+    }
+}
diff --git a/tests/SocratesTest.php b/tests/SocratesTest.php
index 26c4a2e..2ef6c33 100644
--- a/tests/SocratesTest.php
+++ b/tests/SocratesTest.php
@@ -25,18 +25,4 @@ public function it_throws_an_exception_if_a_country_code_is_in_the_wrong_format(
 
         Socrates::validateId('123123123', 'ZZZ');
     }
-
-    /** @test */
-    public function it_uses_the_application_current_locale_if_none_is_provided(): void
-    {
-        App::setLocale('PT');
-
-        $this->assertTrue(
-            Socrates::validateId('11084129 8 ZX8')
-        );
-
-        $this->expectException(UnsupportedOperationException::class);
-
-        Socrates::getCitizenDataFromId('11084129 8 ZX8');
-    }
 }