2025-04-06 06:33:35 +03:00
260 changed files with 8695 additions and 8500 deletions
--- a/.github/main.workflow
+++ b/.github/main.workflow
@ -1,16 +0,0 @@
-workflow "Main" {
-  on = "push"
-  resolves = ["Roave BC Check", "PHPStan"]
-}
-
-action "Roave BC Check" {
-  uses = "docker://nyholm/roave-bc-check-ga"
-  secrets = ["GITHUB_TOKEN"]
-  args = ""
-}
-
-action "PHPStan" {
-  uses = "docker://oskarstark/phpstan-ga"
-  secrets = ["GITHUB_TOKEN"]
-  args = "analyse"
-}
--- a/.php_cs
+++ b/.php_cs
@ -1,32 +1,13 @@
 <?php

-$header = <<<TXT
-Copyright (C) 2013 Mailgun
+/*
+ * In order to make it work, fabpot/php-cs-fixer and sllh/php-cs-fixer-styleci-bridge must be installed globally
+ * with composer.
+ *
+ * @link https://github.com/Soullivaneuh/php-cs-fixer-styleci-bridge
+ * @link https://github.com/FriendsOfPHP/PHP-CS-Fixer
+ */

-This software may be modified and distributed under the terms
-of the MIT license. See the LICENSE file for details.
-TXT;
+use SLLH\StyleCIBridge\ConfigBridge;

-$finder = PhpCsFixer\Finder::create()
-    ->in('src')
-    ->in('tests');
-
-return PhpCsFixer\Config::create()
-    ->setRiskyAllowed(true)
-    ->setRules([
-        '@PSR2' => true,
-        '@Symfony' => true,
-        'strict_param' => true,
-        'array_syntax' => ['syntax' => 'short'],
-        'declare_strict_types' => true,
-        'no_empty_phpdoc' => true,
-        'no_superfluous_phpdoc_tags' => true,
-        'header_comment' => [
-            'commentType' => 'comment',
-            'header' => $header,
-            'location' => 'after_declare_strict',
-            'separate' => 'both',
-        ],
-    ])
-    ->setFinder($finder)
-;
+return ConfigBridge::create();
--- a/.travis.yml
+++ b/.travis.yml
@ -7,46 +7,41 @@ cache:
        - $HOME/.composer/cache/files

 php:
+  - 5.5
+  - 5.6
+  - 7.0
  - 7.1
  - 7.2
-  - 7.3
-
-branches:
-  except:
-    - /^analysis-.*$/
-    - /^patch-.*$/

 env:
-  - TEST_COMMAND="composer test"
+  - TEST_COMMAND="composer test-all"

 matrix:
    fast_finish: true
    include:
-        - php: 7.1
+        - php: 5.5
          env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" PREFER_COVERAGE=true
-        - name: Backward compatibility test (Disabled)
-          php: 7.3
-          env: DEPENDENCIES="roave/backward-compatibility-check"
-          script: ./vendor/bin/roave-backward-compatibility-check || true
-        - name: PHPStan
-          php: 7.2
-          env: DEPENDENCIES="phpstan/phpstan"
-          script:
-            - ./vendor/bin/phpstan --version
-            - ./vendor/bin/phpstan analyse
-
-before_install:
-  - if [[ "$PREFER_COVERAGE" = true ]] && [[ "$TRAVIS_PULL_REQUEST" = false ]]; then TEST_COMMAND="composer test-coverage" COVERAGE=true; fi
-  - if ! [ -z "$DEPENDENCIES" ]; then composer require --no-update ${DEPENDENCIES}; fi;
+        - php: hhvm
+          dist: trusty

 install:
-    - composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
+    - travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
+
+before_script:
+  - if [[ "COVERAGE" = true ]]; then TEST_COMMAND="composer test-coverage"; fi
+  - if ! [[ "$TRAVIS_PULL_REQUEST" = false ]]; then TEST_COMMAND="composer test"; fi
+  - if [[ "$PREFER_COVERAGE" = true ]] && [[ "$TRAVIS_PULL_REQUEST" = false ]]; then TEST_COMMAND="composer test-coverage" COVERAGE=true; fi

 script:
-  - composer validate --strict --no-check-lock
  - echo $TEST_COMMAND
  - $TEST_COMMAND

 after_success:
    - if [[ "$COVERAGE" = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
    - if [[ "$COVERAGE" = true ]]; then php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml; fi
+
+
+notifications:
+  slack:
+    rooms:
+      secure: Xa/LYWGRDOt1Gjw10YTgYmVriSt/MSDOuzqoqQ8OWekJp05C2oRTor8dztEATTM4HQSLrwTa8CTnkFyD8+Z4fbnuvQ0dJ4j5CJYs5AjyirEWwblqS0PIATEEGKffDocsMh4VyMEPSwWXZY319bvG79mUq0E57VmT3y2ROMUuuec=
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,84 +1,6 @@
 # Change Log

-The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
-
-## 3.0.0
-
-### Added
-
- Support for PSR-4
- All classes `Mailgun\Model` are final or abstract. 
-
-### Changed
-
- Dropped PHP5 support
- Removed deprecated code
- Moved `RequestBuilder` and `HttpClientConfigurator` to `Mailgun\HttpClient` namespace
- Updated signature of `Mailgun::__construct()`
-
-### Removed
-
- Dependency on `php-http/message`. 
-
-### [Unreleased]
-
- API v4 Email Validation; please use US Servers with your public key instead
-(please check the Issues [617](https://github.com/mailgun/mailgun-php/issues/617)
-and [619](https://github.com/mailgun/mailgun-php/issues/619) for further details)
-
-## 2.8.1
-
-### Fixed
-
- Added missing method to use all Mailing List and Ip features.
-
-## 2.8.0
-
-### Added
-
- Add support for IPs endpoints
- Add spport for Mailing Lists
- Add `complaints` to Stats / Total Response
- Add more tests for our models
-
-### Changed
-
- Change the PHP Exception message for Bad Request errors to help to find the issue
-
-### Fixed
-
- Fix an issue validating the max path length
-
-## 2.7.0
-
-### Added
-
- Allow to set the Mailgun server when instantiating the Mailgun's client: `$mailgun = Mailgun::create('key', 'server');`
- Add new PHPUnit tests for our models
- Add new PHPUnit tests for our API
- Added `Mailgun\Api\Attachment`
- Fluent interface for `MessageBuilder` and `BatchMessage`
- Support for HTTPlug 2.0
-
-### Changed
-
- Second argument to `Mailgun\Message\MessageBuilder::addBccRecipient()` is now optional. 
- We try to close open resources
-
-### Fixed
-
- Fixed the type error when creating tags. 
-
-## 2.6.0
-
-### Added
-
- Ported MessageBuilder and BatchMessage #472
-
-### Changed
-
- Cast campaign IDs to string #460
- Suggest packages used on Dev #440
+The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release. 

 ## 2.5.0

--- a/README.md
+++ b/README.md
@ -1,11 +1,14 @@
 # Mailgun PHP client

-This is the Mailgun PHP SDK. This SDK contains methods for easily interacting
-with the Mailgun API. Below are examples to get you started. For additional
-examples, please see our official documentation at http://documentation.mailgun.com
+This is the Mailgun PHP SDK. This SDK contains methods for easily interacting 
+with the Mailgun API. 
+Below are examples to get you started. For additional examples, please see our 
+official documentation 
+at http://documentation.mailgun.com

 [![Latest Version](https://img.shields.io/github/release/mailgun/mailgun-php.svg?style=flat-square)](https://github.com/mailgun/mailgun-php/releases)
 [![Build Status](https://img.shields.io/travis/mailgun/mailgun-php/master.svg?style=flat-square)](https://travis-ci.org/mailgun/mailgun-php)
+[![StyleCI](https://styleci.io/repos/11654443/shield?branch=master)](https://styleci.io/repos/11654443)
 [![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/mailgun/mailgun-php.svg?style=flat-square)](https://scrutinizer-ci.com/g/mailgun/mailgun-php)
 [![Quality Score](https://img.shields.io/scrutinizer/g/mailgun/mailgun-php.svg?style=flat-square)](https://scrutinizer-ci.com/g/mailgun/mailgun-php)
 [![Total Downloads](https://img.shields.io/packagist/dt/mailgun/mailgun-php.svg?style=flat-square)](https://packagist.org/packages/mailgun/mailgun-php)
@ -22,23 +25,25 @@ composer:
 curl -sS https://getcomposer.org/installer | php
 ```

-The Mailgun API Client is not hard coupled to Guzzle, Buzz or any other library that sends
-HTTP messages. Instead, it uses the [PSR-18](https://www.php-fig.org/psr/psr-18/) client abstraction.
-This will give you the flexibility to choose what
-[PSR-7 implementation and HTTP client](https://packagist.org/providers/php-http/client-implementation)
-you want to use. 
+The Mailgun api client is not hard coupled to Guzzle or any other library that sends HTTP messages. It uses an abstraction 
+called HTTPlug. This will give you the flexibilty to choose what PSR-7 implementation and HTTP client to use. 

 If you just want to get started quickly you should run the following command: 

 ```bash
-composer require mailgun/mailgun-php kriswallsmith/buzz nyholm/psr7
+php composer.phar require mailgun/mailgun-php php-http/curl-client guzzlehttp/psr7
 ```

+### Why requiring so many packages?
+
+Mailgun has a dependency on the virtual package
+[php-http/client-implementation](https://packagist.org/providers/php-http/client-implementation) which requires you to install **an** adapter, but we do not care which one. That is an implementation detail in your application. We also need **a** PSR-7 implementation and **a** message factory. 
+
+You do not have to use the `php-http/curl-client` if you do not want to. You may use the `php-http/guzzle6-adapter`. Read more about the virtual packages, why this is a good idea and about the flexibility it brings at the [HTTPlug docs](http://docs.php-http.org/en/latest/httplug/users.html).
+
 ## Usage

-You should always use Composer autoloader in your application to automatically load
-your dependencies. All the examples below assume you've already included this in your
-file:
+You should always use Composer's autoloader in your application to automatically load the your dependencies. All examples below assumes you've already included this in your file:

 ```php
 require 'vendor/autoload.php';
@ -48,12 +53,11 @@ use Mailgun\Mailgun;
 Here's how to send a message using the SDK:

 ```php
-// First, instantiate the SDK with your API credentials
-$mg = Mailgun::create('key-example'); // For US servers
-$mg = Mailgun::create('key-example', 'https://api.eu.mailgun.net'); // For EU servers
+# First, instantiate the SDK with your API credentials
+$mg = Mailgun::create('key-example');

-// Now, compose and send your message.
-// $mg->messages()->send($domain, $params);
+# Now, compose and send your message.
+# $mg->messages()->send($domain, $params);
 $mg->messages()->send('example.com', [
  'from'    => 'bob@example.com',
  'to'      => 'sally@example.com',
@ -66,7 +70,7 @@ Attention: `$domain` must match to the domain you have configured on [app.mailgu

 ### All usage examples

-You will find more detailed documentation at [/doc](doc/index.md) and on 
+You find more detailed documentation at [/doc](doc/index.md) and on 
 [https://documentation.mailgun.com](https://documentation.mailgun.com/api_reference.html).

 ### Response
@ -93,7 +97,7 @@ use Mailgun\Hydrator\ArrayHydrator;
 $configurator = new HttpClientConfigurator();
 $configurator->setApiKey('key-example');

-$mg = new Mailgun($configurator, new ArrayHydrator());
+$mg = Mailgun::configure($configurator, new ArrayHydrator());
 $data = $mg->domains()->show('example.com');

 foreach ($data['receiving_dns_records'] as $record) {
@ -108,12 +112,12 @@ the API calls.

 ### Debugging

-Debugging the PHP SDK can be helpful when things aren't working quite right. 
+Debugging the PHP SDK can be really helpful when things aren't working quite right. 
 To debug the SDK, here are some suggestions: 

-Set the endpoint to Mailgun's Postbin. A Postbin is a web service that allows you to
-post data, which then you can display it through a browser. Using Postbin is an easy way
-to quickly determine what data you're transmitting to Mailgun's API.
+Set the endpoint to Mailgun's Postbin. A Postbin is a web service that allows you to 
+post data, which is then displayed through a browser. This allows you to quickly determine
+what is actually being transmitted to Mailgun's API. 

 **Step 1 - Create a new Postbin.**  
 Go to http://bin.mailgun.net. The Postbin will generate a special URL. Save that URL. 
@ -121,13 +125,13 @@ Go to http://bin.mailgun.net. The Postbin will generate a special URL. Save that
 **Step 2 - Instantiate the Mailgun client using Postbin.**  

 *Tip: The bin id will be the URL part after bin.mailgun.net. It will be random generated letters and numbers. 
-For example, the bin id in this URL (http://bin.mailgun.net/aecf68de) is `aecf68de`.*
+For example, the bin id in this URL, http://bin.mailgun.net/aecf68de, is "aecf68de".*

 ```php
 $configurator = new HttpClientConfigurator();
 $configurator->setEndpoint('http://bin.mailgun.net/aecf68de');
 $configurator->setDebug(true);
-$mg = new Mailgun($configurator);
+$mg = Mailgun::configure($configurator);

 # Now, compose and send your message.
 $mg->messages()->send('example.com', [
@ -159,17 +163,15 @@ If you are using a framework you might consider these composer packages to make
 * [Bogardo/Mailgun](https://github.com/Bogardo/Mailgun) for Laravel
 * [katanyoo/yii2-mailgun-mailer](https://github.com/katanyoo/yii2-mailgun-mailer) for Yii2
 * [narendravaghela/cakephp-mailgun](https://github.com/narendravaghela/cakephp-mailgun) for CakePHP
-* [drupal/mailgun](https://www.drupal.org/project/mailgun) for Drupal

 ## Contribute

-This SDK is an Open Source under the MIT license. It is, thus, maintained by collaborators and contributors.
-
-Feel free to contribute in any way. As an example you may: 
-* Trying out the `dev-master` code
+We are currently building a new object oriented API client. Feel free to contribute in any way. As an example you may: 
+* Trying out dev-master the code
 * Create issues if you find problems
 * Reply to other people's issues
 * Review PRs
+* Write PR. You find our current milestone [here](https://github.com/mailgun/mailgun-php/milestone/1) 

 ### Running the test code

@ -191,5 +193,6 @@ information about our API.
 If you find a bug, please submit the issue in Github directly. 
 [Mailgun-PHP Issues](https://github.com/mailgun/mailgun-php/issues)

-As always, if you need additional assistance, drop us a note through your account at
-[https://app.mailgun.com/app/support/list](https://app.mailgun.com/app/support/list).
+As always, if you need additional assistance, drop us a note through your Control Panel at
+[https://mailgun.com/cp/support](https://mailgun.com/cp/support).
+
--- a/composer.json
+++ b/composer.json
@ -2,22 +2,23 @@
    "name": "mailgun/mailgun-php",
    "description": "The Mailgun SDK provides methods for all API functions.",
    "require": {
-        "php": "^7.1",
-        "psr/http-client": "^1.0",
+        "php": "^5.5|^7.0",
+        "php-http/httplug": "^1.0",
        "php-http/multipart-stream-builder": "^1.0",
-        "php-http/client-common": "^1.9 || ^2.0",
-        "php-http/discovery": "^1.6",
+        "php-http/message": "^1.0",
+        "php-http/client-common": "^1.1",
+        "php-http/discovery": "^1.0",
        "webmozart/assert": "^1.2"
    },
    "require-dev": {
-        "phpunit/phpunit": "^7.5",
+        "phpunit/phpunit": "~4.8",
        "php-http/guzzle6-adapter": "^1.0",
-        "nyholm/psr7": "^1.0",
+        "guzzlehttp/psr7": "^1.4",
        "nyholm/nsa": "^1.1"
    },
    "autoload": {
-        "psr-4": {
-            "Mailgun\\": "src/"
+        "psr-0": {
+            "Mailgun": "src/"
        }
    },
    "autoload-dev": {
@ -37,12 +38,9 @@
        }
    ],
    "scripts": {
-        "test": "vendor/bin/phpunit",
-        "test-coverage": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.0-dev"
-        }
+        "test": "vendor/bin/phpunit --testsuite unit && vendor/bin/phpunit --testsuite functional",
+        "test-all": "vendor/bin/phpunit --testsuite all",
+        "test-integration": "vendor/bin/phpunit --testsuite integration",
+        "test-coverage": "vendor/bin/phpunit --testsuite all --coverage-text --coverage-clover=build/coverage.xml"
    }
 }
--- a/doc/attachments.md
+++ b/doc/attachments.md
@ -5,7 +5,7 @@ You may attach a file from memory or by a file path.
 ## From file path

 ```php
-$mg->messages()->send('example.com', [
+$mg->message()->send('example.com', [
  'from'    => 'bob@example.com', 
  'to'      => 'sally@example.com', 
  'subject' => 'Test file path attachments', 
@ -21,7 +21,7 @@ $mg->messages()->send('example.com', [
 // Some how load the file to memory
 $binaryFile = '[Binary data]';

-$mg->messages()->send('example.com', [
+$mg->message()->send('example.com', [
  'from'    => 'bob@example.com', 
  'to'      => 'sally@example.com', 
  'subject' => 'Test memory attachments', 
@ -35,7 +35,7 @@ $mg->messages()->send('example.com', [
 ## Inline attachments

 ```php
-$mg->messages()->send('example.com', [
+$mg->message()->send('example.com', [
  'from'    => 'bob@example.com', 
  'to'      => 'sally@example.com', 
  'subject' => 'Test inline attachments', 
--- a/doc/index.md
+++ b/doc/index.md
@ -3,12 +3,13 @@
 This page will document the API classes and ways to properly use the API. These resources will eventually move to
 the official documentation at [https://documentation.mailgun.com](https://documentation.mailgun.com/api_reference.html).

-Other relevant documentation pages might be:
-
+Other relevant documentation pages might be: 
+ 
 * [Attachments](attachments.md)
 * [Pagination](pagination.md)
-* [Message Builder](/src/Message/README.md)
-* [Batch Message](/src/Message/README.md)
+* [Message Builder](src/Mailgun/Messages/README.md) (Legacy code)
+* [Batch Message](src/Mailgun/Messages/README.md) (Legacy code)
+* [Opt-In Handler](src/Mailgun/Lists/README.md)  (Legacy code)

 ## Domain API

@ -90,9 +91,9 @@ $mailgun->events()->get('example.com');
 #### Send a message
 ```php
 $parameters = [
-    'from'    => 'bob@example.com',
-    'to'      => 'sally@example.com',
-    'subject' => 'The PHP SDK is awesome!',
+    'from'    => 'bob@example.com', 
+    'to'      => 'sally@example.com', 
+    'subject' => 'The PHP SDK is awesome!', 
    'text'    => 'It is so simple to send a message.'
 ];
 $mailgun->messages()->send('example.com', $parameters);
@ -102,10 +103,10 @@ $mailgun->messages()->send('example.com', $parameters);
 Below in an example how to create a Mime message with SwiftMailer.

 ```php
-$message = new Swift_Message('Mail Subject');
+$message = \Swift_Message::newInstance('Mail Subject');
 $message->setFrom(['from@exemple.com' => 'Example Inc']);
 $message->setTo(['user0gmail.com' => 'User 0', 'user1@hotmail.com' => 'User 1']);
-// $message->setBcc('admin@example.com'); Do not do this, BCC will be visible for all receipients if you do.
+// $message->setBcc('admin@example.com'); Do not do this, BCC will be visible for all receipients if you do. 
 $message->setCc('invoice@example.com');

 $messageBody = 'Look at the <b>fancy</b> HTML body.';
@ -115,7 +116,7 @@ $message->setBody($messageBody, 'text/html');
 $to = ['admin@example.com', 'user0gmail.com', 'user1@hotmail.com', 'invoice@example.com']

 // Send the message
-$mailgun->messages()->sendMime('example.com', $to, $message->toString(), []);
+$mailgun->messages()->sendMime('example.com', $to, $message->toString());
 ```

 #### Show a stored message
@ -302,7 +303,7 @@ $valid = $mailgun->webhooks()->verifyWebhookSignature($timestamp, $token, $signa

 if (!$valid) {
    // Create a 403 response
-
+    
    exit();
 }

--- a/phpstan.neon
+++ b/phpstan.neon
@ -1,7 +0,0 @@
-parameters:
-    level: 5
-    paths:
-      - src
-
-    excludes_analyse:
-        - %currentWorkingDirectory%/src/HttpClient/Plugin/HistoryTrait.php
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@ -3,14 +3,30 @@
         colors="true"
         processIsolation="false"
         stopOnFailure="false"
+         syntaxCheck="false"
         convertErrorsToExceptions="true"
         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true">
+         convertWarningsToExceptions="true"
+         testSuiteLoaderClass="PHPUnit_Runner_StandardTestSuiteLoader">

    <testsuites>
-        <testsuite name="Mailgun test suite">
+        <testsuite name="all">
            <directory>tests</directory>
        </testsuite>
+
+        <testsuite name="unit">
+            <directory>tests</directory>
+            <exclude>tests/Integration</exclude>
+            <exclude>test/Functional</exclude>
+        </testsuite>
+
+        <testsuite name="integration">
+            <directory>tests/Integration</directory>
+        </testsuite>
+
+        <testsuite name="functional">
+            <directory>tests/Functional</directory>
+        </testsuite>
    </testsuites>

    <filter>
--- a/src/Api/Attachment.php
+++ b/src/Api/Attachment.php
@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Copyright (C) 2013 Mailgun
- *
- * This software may be modified and distributed under the terms
- * of the MIT license. See the LICENSE file for details.
- */
-
-namespace Mailgun\Api;
-
-use Mailgun\Assert;
-use Psr\Http\Message\ResponseInterface;
-
-/**
- * @author Tobias Nyholm <tobias.nyholm@gmail.com>
- */
-class Attachment extends HttpApi
-{
-    /**
-     * @return ResponseInterface
-     */
-    public function show(string $url)
-    {
-        Assert::stringNotEmpty($url);
-        Assert::regex($url, '@https://.*mailgun\.(net|org)/v.+@');
-        Assert::regex($url, '|/attachments/[0-9]+|');
-
-        $response = $this->httpGet($url);
-
-        if (200 !== $response->getStatusCode()) {
-            $this->handleErrors($response);
-        }
-
-        return $response;
-    }
-}
--- a/src/Api/EmailValidation.php
+++ b/src/Api/EmailValidation.php
@ -1,97 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Copyright (C) 2013 Mailgun
- *
- * This software may be modified and distributed under the terms
- * of the MIT license. See the LICENSE file for details.
- */
-
-namespace Mailgun\Api;
-
-use Mailgun\Assert;
-use Mailgun\Exception\HttpClientException;
-use Mailgun\Exception\HttpServerException;
-use Mailgun\Exception\InvalidArgumentException;
-use Mailgun\Model\EmailValidation\ParseResponse;
-use Mailgun\Model\EmailValidation\ValidateResponse;
-use Psr\Http\Message\ResponseInterface;
-
-/**
- * @see https://documentation.mailgun.com/en/latest/api-email-validation.html
- *
- * @author David Garcia <me@davidgarcia.cat>
- */
-class EmailValidation extends HttpApi
-{
-    /**
-     * Addresses are validated based off defined checks.
-     *
-     * This operation is only accessible with the private API key and not subject to the daily usage limits.
-     *
-     * @param string $address             An email address to validate. Maximum: 512 characters.
-     * @param bool   $mailboxVerification If set to true, a mailbox verification check will be performed
-     *                                    against the address. The default is False.
-     *
-     * @throws InvalidArgumentException Thrown when local validation returns an error
-     * @throws HttpClientException      Thrown when there's an error on Client side
-     * @throws HttpServerException      Thrown when there's an error on Server side
-     * @throws \Exception               Thrown when we don't catch a Client or Server side Exception
-     *
-     * @return ValidateResponse|ResponseInterface
-     */
-    public function validate(string $address, bool $mailboxVerification = false)
-    {
-        Assert::stringNotEmpty($address);
-
-        $params = [
-            'address' => $address,
-            'mailbox_verification' => $mailboxVerification,
-        ];
-
-        $response = $this->httpGet('/address/private/validate', $params);
-
-        return $this->hydrateResponse($response, ValidateResponse::class);
-    }
-
-    /**
-     * Parses a delimiter-separated list of email addresses into two lists: parsed addresses and unparsable portions.
-     *
-     * The parsed addresses are a list of addresses that are syntactically valid
-     * (and optionally pass DNS and ESP specific grammar checks).
-     *
-     * The unparsable list is a list of character sequences that could not be parsed
-     * (or optionally failed DNS or ESP specific grammar checks).
-     *
-     * Delimiter characters are comma (,) and semicolon (;).
-     *
-     * This operation is only accessible with the private API key and not subject to the daily usage limits.
-     *
-     * @param string $addresses  A delimiter separated list of addresses. Maximum: 8000 characters.
-     * @param bool   $syntaxOnly Perform only syntax checks or DNS and ESP specific validation as well.
-     *                           The default is True.
-     *
-     * @throws InvalidArgumentException Thrown when local validation returns an error
-     * @throws HttpClientException      Thrown when there's an error on Client side
-     * @throws HttpServerException      Thrown when there's an error on Server side
-     * @throws \Exception               Thrown when we don't catch a Client or Server side Exception
-     *
-     * @return ParseResponse|ResponseInterface
-     */
-    public function parse(string $addresses, bool $syntaxOnly = true)
-    {
-        Assert::stringNotEmpty($addresses);
-        Assert::maxLength($addresses, 8000);
-
-        $params = [
-            'addresses' => $addresses,
-            'syntax_only' => $syntaxOnly,
-        ];
-
-        $response = $this->httpGet('/address/private/parse', $params);
-
-        return $this->hydrateResponse($response, ParseResponse::class);
-    }
-}
--- a/src/Api/Ip.php
+++ b/src/Api/Ip.php
@ -1,112 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Copyright (C) 2013 Mailgun
- *
- * This software may be modified and distributed under the terms
- * of the MIT license. See the LICENSE file for details.
- */
-
-namespace Mailgun\Api;
-
-use Mailgun\Assert;
-use Mailgun\Model\Ip\IndexResponse;
-use Mailgun\Model\Ip\ShowResponse;
-use Mailgun\Model\Ip\UpdateResponse;
-use Psr\Http\Message\ResponseInterface;
-
-/**
- * @see https://documentation.mailgun.com/en/latest/api-ips.html
- *
- * @author Tobias Nyholm <tobias.nyholm@gmail.com>
- */
-class Ip extends HttpApi
-{
-    /**
-     * Returns a list of IPs.
-     *
-     *
-     * @return IndexResponse|ResponseInterface
-     */
-    public function index(bool $dedicated = false)
-    {
-        Assert::boolean($dedicated);
-
-        $params = [
-            'dedicated' => $dedicated,
-        ];
-
-        $response = $this->httpGet('/v3/ips', $params);
-
-        return $this->hydrateResponse($response, IndexResponse::class);
-    }
-
-    /**
-     * Returns a list of IPs assigned to a domain.
-     *
-     *
-     * @return IndexResponse|ResponseInterface
-     */
-    public function domainIndex(string $domain)
-    {
-        Assert::stringNotEmpty($domain);
-
-        $response = $this->httpGet(sprintf('/v3/domains/%s/ip', $domain));
-
-        return $this->hydrateResponse($response, IndexResponse::class);
-    }
-
-    /**
-     * Returns a single ip.
-     *
-     *
-     * @return ShowResponse|ResponseInterface
-     */
-    public function show(string $ip)
-    {
-        Assert::ip($ip);
-
-        $response = $this->httpGet(sprintf('/v3/ips/%s', $ip));
-
-        return $this->hydrateResponse($response, ShowResponse::class);
-    }
-
-    /**
-     * Assign a dedicated IP to the domain specified.
-     *
-     *
-     * @return UpdateResponse|ResponseInterface
-     */
-    public function assign(string $domain, string $ip)
-    {
-        Assert::stringNotEmpty($domain);
-        Assert::ip($ip);
-
-        $params = [
-            'id' => $ip,
-        ];
-
-        $response = $this->httpPost(sprintf('/v3/domains/%s/ips', $domain), $params);
-
-        return $this->hydrateResponse($response, UpdateResponse::class);
-    }
-
-    /**
-     * Unassign an IP from the domain specified.
-     *
-
-     *
-     * @return UpdateResponse|ResponseInterface
-     */
-    public function unassign(string $domain, string $ip)
-    {
-        Assert::stringNotEmpty($domain);
-        Assert::ip($ip);
-
-        $response = $this->httpDelete(sprintf('/v3/domains/%s/ips/%s', $domain, $ip));
-
-        return $this->hydrateResponse($response, UpdateResponse::class);
-    }
-}
--- a/src/Api/MailingList.php
+++ b/src/Api/MailingList.php
@ -1,155 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Copyright (C) 2013 Mailgun
- *
- * This software may be modified and distributed under the terms
- * of the MIT license. See the LICENSE file for details.
- */
-
-namespace Mailgun\Api;
-
-use Mailgun\Api\MailingList\Member;
-use Mailgun\Assert;
-use Mailgun\Model\MailingList\CreateResponse;
-use Mailgun\Model\MailingList\DeleteResponse;
-use Mailgun\Model\MailingList\PagesResponse;
-use Mailgun\Model\MailingList\ShowResponse;
-use Mailgun\Model\MailingList\UpdateResponse;
-
-/**
- * @see https://documentation.mailgun.com/en/latest/api-mailinglists.html
- */
-class MailingList extends HttpApi
-{
-    public function member(): Member
-    {
-        return new Member($this->httpClient, $this->requestBuilder, $this->hydrator);
-    }
-
-    /**
-     * Returns a paginated list of mailing lists on the domain.
-     *
-     * @param int $limit Maximum number of records to return (optional: 100 by default)
-     *
-     * @return PagesResponse
-     *
-     * @throws \Exception
-     */
-    public function pages(int $limit = 100)
-    {
-        Assert::range($limit, 1, 1000);
-
-        $params = [
-            'limit' => $limit,
-        ];
-
-        $response = $this->httpGet('/v3/lists/pages', $params);
-
-        return $this->hydrateResponse($response, PagesResponse::class);
-    }
-
-    /**
-     * Creates a new mailing list on the current domain.
-     *
-     * @param string $address     Address for the new mailing list
-     * @param string $name        Name for the new mailing list (optional)
-     * @param string $description Description for the new mailing list (optional)
-     * @param string $accessLevel List access level, one of: readonly (default), members, everyone
-     *
-     * @return CreateResponse
-     *
-     * @throws \Exception
-     */
-    public function create(string $address, string $name = null, string $description = null, string $accessLevel = 'readonly')
-    {
-        Assert::stringNotEmpty($address);
-        Assert::nullOrStringNotEmpty($name);
-        Assert::nullOrStringNotEmpty($description);
-        Assert::oneOf($accessLevel, ['readonly', 'members', 'everyone']);
-
-        $params = [
-            'address' => $address,
-            'name' => $name,
-            'description' => $description,
-            'access_level' => $accessLevel,
-        ];
-
-        $response = $this->httpPost('/v3/lists', $params);
-
-        return $this->hydrateResponse($response, CreateResponse::class);
-    }
-
-    /**
-     * Returns a single mailing list.
-     *
-     * @param string $address Address of the mailing list
-     *
-     * @return ShowResponse
-     *
-     * @throws \Exception
-     */
-    public function show(string $address)
-    {
-        Assert::stringNotEmpty($address);
-
-        $response = $this->httpGet(sprintf('/v3/lists/%s', $address));
-
-        return $this->hydrateResponse($response, ShowResponse::class);
-    }
-
-    /**
-     * Updates a mailing list.
-     *
-     * @param string $address    Address of the mailing list
-     * @param array  $parameters Array of field => value pairs to update
-     *
-     * @return UpdateResponse
-     *
-     * @throws \Exception
-     */
-    public function update(string $address, array $parameters = [])
-    {
-        Assert::stringNotEmpty($address);
-        Assert::isArray($parameters);
-
-        foreach ($parameters as $field => $value) {
-            switch ($field) {
-                case 'address':
-                case 'name':
-                case 'description':
-                    Assert::stringNotEmpty($value);
-
-                    break;
-                case 'access_level':
-                    Assert::oneOf($value, ['readonly', 'members', 'everyone']);
-
-                    break;
-            }
-        }
-
-        $response = $this->httpPut(sprintf('/v3/lists/%s', $address), $parameters);
-
-        return $this->hydrateResponse($response, UpdateResponse::class);
-    }
-
-    /**
-     * Removes a mailing list from the domain.
-     *
-     * @param string $address Address of the mailing list
-     *
-     * @return DeleteResponse
-     *
-     * @throws \Exception
-     */
-    public function delete(string $address)
-    {
-        Assert::stringNotEmpty($address);
-
-        $response = $this->httpDelete(sprintf('/v3/lists/%s', $address));
-
-        return $this->hydrateResponse($response, DeleteResponse::class);
-    }
-}
--- a/src/Api/MailingList/Member.php
+++ b/src/Api/MailingList/Member.php
@ -1,242 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Copyright (C) 2013 Mailgun
- *
- * This software may be modified and distributed under the terms
- * of the MIT license. See the LICENSE file for details.
- */
-
-namespace Mailgun\Api\MailingList;
-
-use Mailgun\Api\HttpApi;
-use Mailgun\Assert;
-use Mailgun\Exception\InvalidArgumentException;
-use Mailgun\Model\MailingList\Member\CreateResponse;
-use Mailgun\Model\MailingList\Member\DeleteResponse;
-use Mailgun\Model\MailingList\Member\IndexResponse;
-use Mailgun\Model\MailingList\Member\ShowResponse;
-use Mailgun\Model\MailingList\Member\UpdateResponse;
-use Mailgun\Model\MailingList\UpdateResponse as MailingListUpdateResponse;
-
-/**
- * @see https://documentation.mailgun.com/en/latest/api-mailinglists.html
- */
-class Member extends HttpApi
-{
-    /**
-     * Returns a paginated list of members of the mailing list.
-     *
-     * @param string    $address    Address of the mailing list
-     * @param int       $limit      Maximum number of records to return (optional: 100 by default)
-     * @param bool|null $subscribed `true` to lists subscribed, `false` for unsubscribed. list all if null
-     *
-     * @return IndexResponse
-     *
-     * @throws \Exception
-     */
-    public function index(string $address, int $limit = 100, bool $subscribed = null)
-    {
-        Assert::stringNotEmpty($address);
-        Assert::greaterThan($limit, 0);
-
-        $params = [
-            'limit' => $limit,
-        ];
-
-        if (true === $subscribed) {
-            $params['subscribed'] = 'yes';
-        } elseif (false === $subscribed) {
-            $params['subscribed'] = 'no';
-        }
-
-        $response = $this->httpGet(sprintf('/v3/lists/%s/members/pages', $address), $params);
-
-        return $this->hydrateResponse($response, IndexResponse::class);
-    }
-
-    /**
-     * Shows a single member of the mailing list.
-     *
-     * @param string $list    Address of the mailing list
-     * @param string $address Address of the member
-     *
-     * @return ShowResponse
-     *
-     * @throws \Exception
-     */
-    public function show(string $list, string $address)
-    {
-        Assert::stringNotEmpty($list);
-        Assert::stringNotEmpty($address);
-
-        $response = $this->httpGet(sprintf('/v3/lists/%s/members/%s', $list, $address));
-
-        return $this->hydrateResponse($response, ShowResponse::class);
-    }
-
-    /**
-     * Creates (or updates) a member of the mailing list.
-     *
-     * @param string $list       Address of the mailing list
-     * @param string $address    Address for the member
-     * @param string $name       Name for the member (optional)
-     * @param array  $vars       Array of field => value pairs to store additional data
-     * @param bool   $subscribed `true` to add as subscribed (default), `false` as unsubscribed
-     * @param bool   $upsert     `true` to update member if present, `false` to raise error in case of a duplicate member (default)
-     *
-     * @return CreateResponse
-     *
-     * @throws \Exception
-     */
-    public function create(string $list, string $address, string $name = null, array $vars = [], bool $subscribed = true, bool $upsert = false)
-    {
-        Assert::stringNotEmpty($list);
-        Assert::stringNotEmpty($address);
-        Assert::nullOrStringNotEmpty($name);
-
-        $params = [
-            'address' => $address,
-            'name' => $name,
-            'vars' => \json_encode($vars),
-            'subscribed' => $subscribed ? 'yes' : 'no',
-            'upsert' => $upsert ? 'yes' : 'no',
-        ];
-
-        $response = $this->httpPost(sprintf('/v3/lists/%s/members', $list), $params);
-
-        return $this->hydrateResponse($response, CreateResponse::class);
-    }
-
-    /**
-     * Adds multiple members (up to 1000) to the mailing list.
-     *
-     * @param string $list    Address of the mailing list
-     * @param array  $members Array of members, each item should be either a single string address or an array of member properties
-     * @param bool   $upsert  `true` to update existing members, `false` (default) to ignore duplicates
-     *
-     * @return UpdateResponse
-     *
-     * @throws \Exception
-     */
-    public function createMultiple(string $list, array $members, $upsert = false)
-    {
-        Assert::stringNotEmpty($list);
-        Assert::isArray($members);
-
-        // workaround for webmozart/asserts <= 1.2
-        if (count($members) > 1000) {
-            throw new InvalidArgumentException(sprintf(
-                'Expected an Array to contain at most %2$d elements. Got: %d',
-                1000,
-                count($members)
-            ));
-        }
-
-        foreach ($members as $data) {
-            if (is_string($data)) {
-                Assert::stringNotEmpty($data);
-                // single address - no additional validation required
-                continue;
-            }
-
-            Assert::isArray($data);
-
-            foreach ($data as $field => &$value) {
-                switch ($field) {
-                    case 'address':
-                        Assert::stringNotEmpty($value);
-
-                        break;
-                    case 'vars':
-                        if (is_array($value)) {
-                            $value = json_encode($value);
-                        }
-                        // We should assert that "vars"'s $value is a string.
-                        // no break
-                    case 'name':
-                        Assert::string($value);
-
-                        break;
-                    case 'subscribed':
-                        Assert::oneOf($value, ['yes', 'no']);
-
-                        break;
-                }
-            }
-        }
-
-        $params = [
-            'members' => json_encode($members),
-            'upsert' => $upsert ? 'yes' : 'no',
-        ];
-
-        $response = $this->httpPost(sprintf('/v3/lists/%s/members.json', $list), $params);
-
-        return $this->hydrateResponse($response, MailingListUpdateResponse::class);
-    }
-
-    /**
-     * Updates a member on the mailing list.
-     *
-     * @param string $list       Address of the mailing list
-     * @param string $address    Address of the member
-     * @param array  $parameters Array of key => value pairs to update
-     *
-     * @return UpdateResponse
-     *
-     * @throws \Exception
-     */
-    public function update(string $list, string $address, array $parameters = [])
-    {
-        Assert::stringNotEmpty($list);
-        Assert::stringNotEmpty($address);
-        Assert::isArray($parameters);
-
-        foreach ($parameters as $field => $value) {
-            switch ($field) {
-                case 'vars':
-                    if (is_array($value)) {
-                        $value = json_encode($value);
-                    }
-                    // We should assert that "vars"'s $value is a string.
-                    // no break
-                case 'address':
-                case 'name':
-                    Assert::stringNotEmpty($value);
-
-                    break;
-                case 'subscribed':
-                    Assert::oneOf($value, ['yes', 'no']);
-
-                    break;
-            }
-        }
-
-        $response = $this->httpPut(sprintf('/v3/lists/%s/members/%s', $list, $address), $parameters);
-
-        return $this->hydrateResponse($response, UpdateResponse::class);
-    }
-
-    /**
-     * Removes a member from the mailing list.
-     *
-     * @param string $list    Address of the mailing list
-     * @param string $address Address of the member
-     *
-     * @return DeleteResponse
-     *
-     * @throws \Exception
-     */
-    public function delete(string $list, string $address)
-    {
-        Assert::stringNotEmpty($list);
-        Assert::stringNotEmpty($address);
-
-        $response = $this->httpDelete(sprintf('/v3/lists/%s/members/%s', $list, $address));
-
-        return $this->hydrateResponse($response, DeleteResponse::class);
-    }
-}
--- a/src/Exception/HttpClientException.php
+++ b/src/Exception/HttpClientException.php
@ -1,115 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Copyright (C) 2013 Mailgun
- *
- * This software may be modified and distributed under the terms
- * of the MIT license. See the LICENSE file for details.
- */
-
-namespace Mailgun\Exception;
-
-use Mailgun\Exception;
-use Psr\Http\Message\ResponseInterface;
-
-/**
- * @author Tobias Nyholm <tobias.nyholm@gmail.com>
- */
-final class HttpClientException extends \RuntimeException implements Exception
-{
-    /**
-     * @var ResponseInterface|null
-     */
-    private $response;
-
-    /**
-     * @var array
-     */
-    private $responseBody = [];
-
-    /**
-     * @var int
-     */
-    private $responseCode;
-
-    public function __construct(string $message, int $code, ResponseInterface $response)
-    {
-        parent::__construct($message, $code);
-
-        $this->response = $response;
-        $this->responseCode = $response->getStatusCode();
-        $body = $response->getBody()->__toString();
-        if (0 !== strpos($response->getHeaderLine('Content-Type'), 'application/json')) {
-            $this->responseBody['message'] = $body;
-        } else {
-            $this->responseBody = json_decode($body, true);
-        }
-    }
-
-    public static function badRequest(ResponseInterface $response)
-    {
-        $body = $response->getBody()->__toString();
-        if (0 !== strpos($response->getHeaderLine('Content-Type'), 'application/json')) {
-            $validationMessage = $body;
-        } else {
-            $jsonDecoded = json_decode($body, true);
-            $validationMessage = isset($jsonDecoded['message']) ? $jsonDecoded['message'] : $body;
-        }
-
-        $message = sprintf("The parameters passed to the API were invalid. Check your inputs!\n\n%s", $validationMessage);
-
-        return new self($message, 400, $response);
-    }
-
-    public static function unauthorized(ResponseInterface $response)
-    {
-        return new self('Your credentials are incorrect.', 401, $response);
-    }
-
-    public static function requestFailed(ResponseInterface $response)
-    {
-        return new self('Parameters were valid but request failed. Try again.', 402, $response);
-    }
-
-    public static function notFound(ResponseInterface $response)
-    {
-        return new self('The endpoint you have tried to access does not exist. Check if the domain matches the domain you have configure on Mailgun.', 404, $response);
-    }
-
-    public static function payloadTooLarge(ResponseInterface $response)
-    {
-        return new self('Payload too large, your total attachment size is too big.', 413, $response);
-    }
-
-    public static function forbidden(ResponseInterface $response)
-    {
-        $body = $response->getBody()->__toString();
-        if (0 !== strpos($response->getHeaderLine('Content-Type'), 'application/json')) {
-            $validationMessage = $body;
-        } else {
-            $jsonDecoded = json_decode($body, true);
-            $validationMessage = isset($jsonDecoded['Error']) ? $jsonDecoded['Error'] : $body;
-        }
-
-        $message = sprintf("Forbidden!\n\n%s", $validationMessage);
-
-        return new self($message, 403, $response);
-    }
-
-    public function getResponse(): ?ResponseInterface
-    {
-        return $this->response;
-    }
-
-    public function getResponseBody(): array
-    {
-        return $this->responseBody;
-    }
-
-    public function getResponseCode(): int
-    {
-        return $this->responseCode;
-    }
-}
--- a/src/HttpClient/Plugin/HistoryTrait.php
+++ b/src/HttpClient/Plugin/HistoryTrait.php
@ -1,41 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Copyright (C) 2013 Mailgun
- *
- * This software may be modified and distributed under the terms
- * of the MIT license. See the LICENSE file for details.
- */
-
-namespace Mailgun\HttpClient\Plugin;
-
-use Http\Client\Exception;
-use Psr\Http\Client\ClientExceptionInterface;
-use Psr\Http\Message\RequestInterface;
-
-/*
- * Below is a some code to make the History plugin compatible with both 1.x and 2.x of php-client/client-common
- */
-if (\interface_exists(\Http\Client\Common\HttpMethodsClientInterface::class)) {
-    /**
-     * @internal code for php-http/client-common:2.x
-     */
-    trait HistoryTrait
-    {
-        public function addFailure(RequestInterface $request, ClientExceptionInterface $exception)
-        {
-        }
-    }
-} else {
-    /**
-     * @internal code for php-http/client-common:1.x
-     */
-    trait HistoryTrait
-    {
-        public function addFailure(RequestInterface $request, Exception $exception)
-        {
-        }
-    }
-}
--- a/src/HttpClient/RequestBuilder.php
+++ b/src/HttpClient/RequestBuilder.php
@ -1,138 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Copyright (C) 2013 Mailgun
- *
- * This software may be modified and distributed under the terms
- * of the MIT license. See the LICENSE file for details.
- */
-
-namespace Mailgun\HttpClient;
-
-use Http\Discovery\Psr17FactoryDiscovery;
-use Http\Message\MultipartStream\MultipartStreamBuilder;
-use Psr\Http\Message\RequestFactoryInterface;
-use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\StreamFactoryInterface;
-use Psr\Http\Message\StreamInterface;
-
-/**
- * @author Tobias Nyholm <tobias.nyholm@gmail.com>
- */
-class RequestBuilder
-{
-    /**
-     * @var RequestFactoryInterface|null
-     */
-    private $requestFactory;
-
-    /**
-     * @var StreamFactoryInterface|null
-     */
-    private $streamFactory;
-
-    /**
-     * @var MultipartStreamBuilder
-     */
-    private $multipartStreamBuilder;
-
-    /**
-     * Creates a new PSR-7 request.
-     *
-     * @param array|string|null $body Request body. If body is an array we will send a as multipart stream request.
-     *                                If array, each array *item* MUST look like:
-     *                                array (
-     *                                'content' => string|resource|StreamInterface,
-     *                                'name'    => string,
-     *                                'filename'=> string (optional)
-     *                                'headers' => array (optinal) ['header-name' => 'header-value']
-     *                                )
-     */
-    public function create(string $method, string $uri, array $headers = [], $body = null): RequestInterface
-    {
-        if (!is_array($body)) {
-            $stream = $this->getStreamFactory()->createStream((string) $body);
-
-            return $this->createRequest($method, $uri, $headers, $stream);
-        }
-
-        $builder = $this->getMultipartStreamBuilder();
-        foreach ($body as $item) {
-            $name = $item['name'];
-            $content = $item['content'];
-            unset($item['name']);
-            unset($item['content']);
-
-            $builder->addResource($name, $content, $item);
-        }
-
-        $multipartStream = $builder->build();
-        $boundary = $builder->getBoundary();
-        $builder->reset();
-
-        $headers['Content-Type'] = 'multipart/form-data; boundary="'.$boundary.'"';
-
-        return $this->createRequest($method, $uri, $headers, $multipartStream);
-    }
-
-    private function getRequestFactory(): RequestFactoryInterface
-    {
-        if (null === $this->requestFactory) {
-            $this->requestFactory = Psr17FactoryDiscovery::findRequestFactory();
-        }
-
-        return $this->requestFactory;
-    }
-
-    public function setRequestFactory(RequestFactoryInterface $requestFactory): self
-    {
-        $this->requestFactory = $requestFactory;
-
-        return $this;
-    }
-
-    private function getStreamFactory(): StreamFactoryInterface
-    {
-        if (null === $this->streamFactory) {
-            $this->streamFactory = Psr17FactoryDiscovery::findStreamFactory();
-        }
-
-        return $this->streamFactory;
-    }
-
-    public function setStreamFactory(StreamFactoryInterface $streamFactory): self
-    {
-        $this->streamFactory = $streamFactory;
-
-        return $this;
-    }
-
-    private function getMultipartStreamBuilder(): MultipartStreamBuilder
-    {
-        if (null === $this->multipartStreamBuilder) {
-            $this->multipartStreamBuilder = new MultipartStreamBuilder();
-        }
-
-        return $this->multipartStreamBuilder;
-    }
-
-    public function setMultipartStreamBuilder(MultipartStreamBuilder $multipartStreamBuilder): self
-    {
-        $this->multipartStreamBuilder = $multipartStreamBuilder;
-
-        return $this;
-    }
-
-    private function createRequest(string $method, string $uri, array $headers, StreamInterface $stream)
-    {
-        $request = $this->getRequestFactory()->createRequest($method, $uri);
-        $request = $request->withBody($stream);
-        foreach ($headers as $name => $value) {
-            $request = $request->withAddedHeader($name, $value);
-        }
-
-        return $request;
-    }
-}
--- a/src/Mailgun.php
+++ b/src/Mailgun.php
@ -1,141 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Copyright (C) 2013 Mailgun
- *
- * This software may be modified and distributed under the terms
- * of the MIT license. See the LICENSE file for details.
- */
-
-namespace Mailgun;
-
-use Http\Client\Common\PluginClient;
-use Mailgun\HttpClient\HttpClientConfigurator;
-use Mailgun\HttpClient\Plugin\History;
-use Mailgun\HttpClient\RequestBuilder;
-use Mailgun\Hydrator\ModelHydrator;
-use Mailgun\Hydrator\Hydrator;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Client\ClientInterface;
-
-/**
- * This class is the base class for the Mailgun SDK.
- */
-class Mailgun
-{
-    /**
-     * @var string|null
-     */
-    private $apiKey;
-
-    /**
-     * @var ClientInterface|PluginClient
-     */
-    private $httpClient;
-
-    /**
-     * @var Hydrator
-     */
-    private $hydrator;
-
-    /**
-     * @var RequestBuilder
-     */
-    private $requestBuilder;
-
-    /**
-     * This is a object that holds the last response from the API.
-     *
-     * @var History
-     */
-    private $responseHistory;
-
-    public function __construct(
-        HttpClientConfigurator $configurator,
-        Hydrator $hydrator = null,
-        RequestBuilder $requestBuilder = null
-    ) {
-        $this->requestBuilder = $requestBuilder ?: new RequestBuilder();
-        $this->hydrator = $hydrator ?: new ModelHydrator();
-
-        $this->httpClient = $configurator->createConfiguredClient();
-        $this->apiKey = $configurator->getApiKey();
-        $this->responseHistory = $configurator->getResponseHistory();
-    }
-
-    public static function create(string $apiKey, string $endpoint = 'https://api.mailgun.net'): self
-    {
-        $httpClientConfigurator = (new HttpClientConfigurator())
-            ->setApiKey($apiKey)
-            ->setEndpoint($endpoint);
-
-        return new self($httpClientConfigurator);
-    }
-
-    public function getLastResponse(): ?ResponseInterface
-    {
-        return $this->responseHistory->getLastResponse();
-    }
-
-    public function attachment(): Api\Attachment
-    {
-        return new Api\Attachment($this->httpClient, $this->requestBuilder, $this->hydrator);
-    }
-
-    public function domains(): Api\Domain
-    {
-        return new Api\Domain($this->httpClient, $this->requestBuilder, $this->hydrator);
-    }
-
-    public function emailValidation(): Api\EmailValidation
-    {
-        return new Api\EmailValidation($this->httpClient, $this->requestBuilder, $this->hydrator);
-    }
-
-    public function events(): Api\Event
-    {
-        return new Api\Event($this->httpClient, $this->requestBuilder, $this->hydrator);
-    }
-
-    public function ips(): Api\Ip
-    {
-        return new Api\Ip($this->httpClient, $this->requestBuilder, $this->hydrator);
-    }
-
-    public function mailingList(): Api\MailingList
-    {
-        return new Api\MailingList($this->httpClient, $this->requestBuilder, $this->hydrator);
-    }
-
-    public function messages(): Api\Message
-    {
-        return new Api\Message($this->httpClient, $this->requestBuilder, $this->hydrator);
-    }
-
-    public function routes(): Api\Route
-    {
-        return new Api\Route($this->httpClient, $this->requestBuilder, $this->hydrator);
-    }
-
-    public function suppressions(): Api\Suppression
-    {
-        return new Api\Suppression($this->httpClient, $this->requestBuilder, $this->hydrator);
-    }
-
-    public function stats(): Api\Stats
-    {
-        return new Api\Stats($this->httpClient, $this->requestBuilder, $this->hydrator);
-    }
-
-    public function tags(): Api\Tag
-    {
-        return new Api\Tag($this->httpClient, $this->requestBuilder, $this->hydrator);
-    }
-
-    public function webhooks(): Api\Webhook
-    {
-        return new Api\Webhook($this->httpClient, $this->requestBuilder, $this->hydrator, $this->apiKey);
-    }
-}
--- a/src/Mailgun/Api/Domain.php
+++ b/src/Mailgun/Api/Domain.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -26,7 +24,7 @@ use Mailgun\Model\Domain\VerifyResponse;
 use Psr\Http\Message\ResponseInterface;

 /**
- * @see https://documentation.mailgun.com/api-domains.html
+ * {@link https://documentation.mailgun.com/api-domains.html}.
 *
 * @author Sean Johnson <sean@mailgun.com>
 */
@ -35,12 +33,15 @@ class Domain extends HttpApi
    /**
     * Returns a list of domains on the account.
     *
+     * @param int $limit
+     * @param int $skip
     *
     * @return IndexResponse
     */
-    public function index(int $limit = 100, int $skip = 0)
+    public function index($limit = 100, $skip = 0)
    {
-        Assert::range($limit, 1, 1000);
+        Assert::integer($limit);
+        Assert::integer($skip);

        $params = [
            'limit' => $limit,
@ -55,11 +56,11 @@ class Domain extends HttpApi
    /**
     * Returns a single domain.
     *
-     * @param string $domain name of the domain
+     * @param string $domain Name of the domain.
     *
     * @return ShowResponse|array|ResponseInterface
     */
-    public function show(string $domain)
+    public function show($domain)
    {
        Assert::stringNotEmpty($domain);

@ -75,36 +76,27 @@ class Domain extends HttpApi
     *
     * @see https://documentation.mailgun.com/en/latest/api-domains.html#domains
     *
-     * @param string $domain     name of the domain
-     * @param string $smtpPass   password for SMTP authentication
-     * @param string $spamAction `disable` or `tag` - inbound spam filtering
-     * @param bool   $wildcard   domain will accept email for subdomains
+     * @param string $domain     Name of the domain.
+     * @param string $smtpPass   Password for SMTP authentication.
+     * @param string $spamAction `disable` or `tag` - inbound spam filtering.
+     * @param bool   $wildcard   Domain will accept email for subdomains.
     *
     * @return CreateResponse|array|ResponseInterface
     */
-    public function create(string $domain, string $smtpPass = null, string $spamAction = null, bool $wildcard = null)
+    public function create($domain, $smtpPass = null, $spamAction = null, $wildcard = null)
    {
        Assert::stringNotEmpty($domain);

        $params['name'] = $domain;

+        // If at least smtpPass available, check for the fields spamAction wildcard
        if (!empty($smtpPass)) {
-            Assert::stringNotEmpty($smtpPass);
-
-            $params['smtp_password'] = $smtpPass;
-        }
-
-        if (!empty($spamAction)) {
            // TODO(sean.johnson): Extended spam filter input validation.
            Assert::stringNotEmpty($spamAction);
-
-            $params['spam_action'] = $spamAction;
-        }
-
-        if (null !== $wildcard) {
            Assert::boolean($wildcard);

-            $params['wildcard'] = $wildcard ? 'true' : 'false';
+            $params['smtp_password'] = $smtpPass;
+            $params['spam_action'] = $spamAction;
        }

        $response = $this->httpPost('/v3/domains', $params);
@ -116,11 +108,11 @@ class Domain extends HttpApi
     * Removes a domain from the account.
     * WARNING: This action is irreversible! Be cautious!
     *
-     * @param string $domain name of the domain
+     * @param string $domain Name of the domain.
     *
     * @return DeleteResponse|array|ResponseInterface
     */
-    public function delete(string $domain)
+    public function delete($domain)
    {
        Assert::stringNotEmpty($domain);

@ -132,15 +124,18 @@ class Domain extends HttpApi
    /**
     * Returns a list of SMTP credentials for the specified domain.
     *
-     * @param string $domain name of the domain
+     * @param string $domain Name of the domain.
     * @param int    $limit  Number of credentials to return
     * @param int    $skip   Number of credentials to omit from the list
     *
     * @return CredentialResponse
     */
-    public function credentials(string $domain, int $limit = 100, int $skip = 0)
+    public function credentials($domain, $limit = 100, $skip = 0)
    {
        Assert::stringNotEmpty($domain);
+        Assert::integer($limit);
+        Assert::integer($skip);
+
        $params = [
            'limit' => $limit,
            'skip' => $skip,
@ -154,13 +149,13 @@ class Domain extends HttpApi
    /**
     * Create a new SMTP credential pair for the specified domain.
     *
-     * @param string $domain   name of the domain
-     * @param string $login    SMTP Username
+     * @param string $domain   Name of the domain.
+     * @param string $login    SMTP Username.
     * @param string $password SMTP Password. Length min 5, max 32.
     *
     * @return CreateCredentialResponse|array|ResponseInterface
     */
-    public function createCredential(string $domain, string $login, string $password)
+    public function createCredential($domain, $login, $password)
    {
        Assert::stringNotEmpty($domain);
        Assert::stringNotEmpty($login);
@ -180,13 +175,13 @@ class Domain extends HttpApi
    /**
     * Update a set of SMTP credentials for the specified domain.
     *
-     * @param string $domain name of the domain
-     * @param string $login  SMTP Username
+     * @param string $domain Name of the domain.
+     * @param string $login  SMTP Username.
     * @param string $pass   New SMTP Password. Length min 5, max 32.
     *
     * @return UpdateCredentialResponse|array|ResponseInterface
     */
-    public function updateCredential(string $domain, string $login, string $pass)
+    public function updateCredential($domain, $login, $pass)
    {
        Assert::stringNotEmpty($domain);
        Assert::stringNotEmpty($login);
@ -205,12 +200,12 @@ class Domain extends HttpApi
    /**
     * Remove a set of SMTP credentials from the specified domain.
     *
-     * @param string $domain name of the domain
-     * @param string $login  SMTP Username
+     * @param string $domain Name of the domain.
+     * @param string $login  SMTP Username.
     *
     * @return DeleteCredentialResponse|array|ResponseInterface
     */
-    public function deleteCredential(string $domain, string $login)
+    public function deleteCredential($domain, $login)
    {
        Assert::stringNotEmpty($domain);
        Assert::stringNotEmpty($login);
@ -229,11 +224,11 @@ class Domain extends HttpApi
    /**
     * Returns delivery connection settings for the specified domain.
     *
-     * @param string $domain name of the domain
+     * @param string $domain Name of the domain.
     *
     * @return ConnectionResponse|ResponseInterface
     */
-    public function connection(string $domain)
+    public function connection($domain)
    {
        Assert::stringNotEmpty($domain);

@ -246,15 +241,18 @@ class Domain extends HttpApi
     * Updates the specified delivery connection settings for the specified domain.
     * If a parameter is passed in as null, it will not be updated.
     *
-     * @param string    $domain     name of the domain
-     * @param bool|null $requireTLS enforces that messages are sent only over a TLS connection
-     * @param bool|null $noVerify   disables TLS certificate and hostname verification
+     * @param string    $domain     Name of the domain.
+     * @param bool|null $requireTLS Enforces that messages are sent only over a TLS connection.
+     * @param bool|null $noVerify   Disables TLS certificate and hostname verification.
     *
     * @return UpdateConnectionResponse|array|ResponseInterface
     */
-    public function updateConnection(string $domain, ?bool $requireTLS, ?bool $noVerify)
+    public function updateConnection($domain, $requireTLS, $noVerify)
    {
        Assert::stringNotEmpty($domain);
+        Assert::nullOrBoolean($requireTLS);
+        Assert::nullOrBoolean($noVerify);
+
        $params = [];

        if (null !== $requireTLS) {
@ -273,11 +271,11 @@ class Domain extends HttpApi
    /**
     * Returns a single domain.
     *
-     * @param string $domain name of the domain
+     * @param string $domain Name of the domain.
     *
     * @return VerifyResponse|array|ResponseInterface
     */
-    public function verify(string $domain)
+    public function verify($domain)
    {
        Assert::stringNotEmpty($domain);

--- a/src/Mailgun/Api/Event.php
+++ b/src/Mailgun/Api/Event.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -15,7 +13,7 @@ use Mailgun\Assert;
 use Mailgun\Model\Event\EventResponse;

 /**
- * @see https://documentation.mailgun.com/en/latest/api-events.html
+ * {@link https://documentation.mailgun.com/api-events.html}.
 *
 * @author Tobias Nyholm <tobias.nyholm@gmail.com>
 */
@ -24,16 +22,15 @@ class Event extends HttpApi
    use Pagination;

    /**
+     * @param string $domain
+     * @param array  $params
+     *
     * @return EventResponse
     */
-    public function get(string $domain, array $params = [])
+    public function get($domain, array $params = [])
    {
        Assert::stringNotEmpty($domain);

-        if (array_key_exists('limit', $params)) {
-            Assert::range($params['limit'], 1, 300);
-        }
-
        $response = $this->httpGet(sprintf('/v3/%s/events', $domain), $params);

        return $this->hydrateResponse($response, EventResponse::class);
--- a/src/Mailgun/Api/HttpApi.php
+++ b/src/Mailgun/Api/HttpApi.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -11,14 +9,14 @@ declare(strict_types=1);

 namespace Mailgun\Api;

+use Http\Client\Exception as HttplugException;
+use Http\Client\HttpClient;
 use Mailgun\Exception\UnknownErrorException;
 use Mailgun\Hydrator\Hydrator;
 use Mailgun\Hydrator\NoopHydrator;
 use Mailgun\Exception\HttpClientException;
 use Mailgun\Exception\HttpServerException;
-use Mailgun\HttpClient\RequestBuilder;
-use Psr\Http\Client as Psr18;
-use Psr\Http\Client\ClientInterface;
+use Mailgun\RequestBuilder;
 use Psr\Http\Message\ResponseInterface;

 /**
@ -29,12 +27,12 @@ abstract class HttpApi
    /**
     * The HTTP client.
     *
-     * @var ClientInterface
+     * @var HttpClient
     */
-    protected $httpClient;
+    private $httpClient;

    /**
-     * @var Hydrator|null
+     * @var Hydrator
     */
    protected $hydrator;

@ -43,7 +41,12 @@ abstract class HttpApi
     */
    protected $requestBuilder;

-    public function __construct(ClientInterface $httpClient, RequestBuilder $requestBuilder, Hydrator $hydrator)
+    /**
+     * @param HttpClient     $httpClient
+     * @param RequestBuilder $requestBuilder
+     * @param Hydrator       $hydrator
+     */
+    public function __construct(HttpClient $httpClient, RequestBuilder $requestBuilder, Hydrator $hydrator)
    {
        $this->httpClient = $httpClient;
        $this->requestBuilder = $requestBuilder;
@ -53,13 +56,16 @@ abstract class HttpApi
    }

    /**
+     * @param ResponseInterface $response
+     * @param string            $class
+     *
     * @return mixed|ResponseInterface
     *
     * @throws \Exception
     */
-    protected function hydrateResponse(ResponseInterface $response, string $class)
+    protected function hydrateResponse(ResponseInterface $response, $class)
    {
-        if (null === $this->hydrator) {
+        if (!$this->hydrator) {
            return $response;
        }

@ -73,6 +79,8 @@ abstract class HttpApi
    /**
     * Throw the correct exception for this error.
     *
+     * @param ResponseInterface $response
+     *
     * @throws \Exception
     */
    protected function handleErrors(ResponseInterface $response)
@ -85,8 +93,6 @@ abstract class HttpApi
                throw HttpClientException::unauthorized($response);
            case 402:
                throw HttpClientException::requestFailed($response);
-            case 403:
-                throw  HttpClientException::forbidden($response);
            case 404:
                throw HttpClientException::notFound($response);
            case 413:
@ -104,8 +110,10 @@ abstract class HttpApi
     * @param string $path           Request path
     * @param array  $parameters     GET parameters
     * @param array  $requestHeaders Request Headers
+     *
+     * @return ResponseInterface
     */
-    protected function httpGet(string $path, array $parameters = [], array $requestHeaders = []): ResponseInterface
+    protected function httpGet($path, array $parameters = [], array $requestHeaders = [])
    {
        if (count($parameters) > 0) {
            $path .= '?'.http_build_query($parameters);
@ -115,7 +123,7 @@ abstract class HttpApi
            $response = $this->httpClient->sendRequest(
                $this->requestBuilder->create('GET', $path, $requestHeaders)
            );
-        } catch (Psr18\NetworkExceptionInterface $e) {
+        } catch (HttplugException\NetworkException $e) {
            throw HttpServerException::networkError($e);
        }

@ -128,8 +136,10 @@ abstract class HttpApi
     * @param string $path           Request path
     * @param array  $parameters     POST parameters
     * @param array  $requestHeaders Request headers
+     *
+     * @return ResponseInterface
     */
-    protected function httpPost(string $path, array $parameters = [], array $requestHeaders = []): ResponseInterface
+    protected function httpPost($path, array $parameters = [], array $requestHeaders = [])
    {
        return $this->httpPostRaw($path, $this->createRequestBody($parameters), $requestHeaders);
    }
@ -140,14 +150,16 @@ abstract class HttpApi
     * @param string       $path           Request path
     * @param array|string $body           Request body
     * @param array        $requestHeaders Request headers
+     *
+     * @return ResponseInterface
     */
-    protected function httpPostRaw(string $path, $body, array $requestHeaders = []): ResponseInterface
+    protected function httpPostRaw($path, $body, array $requestHeaders = [])
    {
        try {
            $response = $this->httpClient->sendRequest(
                $this->requestBuilder->create('POST', $path, $requestHeaders, $body)
            );
-        } catch (Psr18\NetworkExceptionInterface $e) {
+        } catch (HttplugException\NetworkException $e) {
            throw HttpServerException::networkError($e);
        }

@ -160,14 +172,16 @@ abstract class HttpApi
     * @param string $path           Request path
     * @param array  $parameters     PUT parameters
     * @param array  $requestHeaders Request headers
+     *
+     * @return ResponseInterface
     */
-    protected function httpPut(string $path, array $parameters = [], array $requestHeaders = []): ResponseInterface
+    protected function httpPut($path, array $parameters = [], array $requestHeaders = [])
    {
        try {
            $response = $this->httpClient->sendRequest(
                $this->requestBuilder->create('PUT', $path, $requestHeaders, $this->createRequestBody($parameters))
            );
-        } catch (Psr18\NetworkExceptionInterface $e) {
+        } catch (HttplugException\NetworkException $e) {
            throw HttpServerException::networkError($e);
        }

@ -180,14 +194,16 @@ abstract class HttpApi
     * @param string $path           Request path
     * @param array  $parameters     DELETE parameters
     * @param array  $requestHeaders Request headers
+     *
+     * @return ResponseInterface
     */
-    protected function httpDelete(string $path, array $parameters = [], array $requestHeaders = []): ResponseInterface
+    protected function httpDelete($path, array $parameters = [], array $requestHeaders = [])
    {
        try {
            $response = $this->httpClient->sendRequest(
                $this->requestBuilder->create('DELETE', $path, $requestHeaders, $this->createRequestBody($parameters))
            );
-        } catch (Psr18\NetworkExceptionInterface $e) {
+        } catch (HttplugException\NetworkException $e) {
            throw HttpServerException::networkError($e);
        }

@ -198,8 +214,10 @@ abstract class HttpApi
     * Prepare a set of key-value-pairs to be encoded as multipart/form-data.
     *
     * @param array $parameters Request parameters
+     *
+     * @return array
     */
-    private function createRequestBody(array $parameters): array
+    protected function createRequestBody(array $parameters)
    {
        $resources = [];
        foreach ($parameters as $key => $values) {
--- a/src/Mailgun/Api/Message.php
+++ b/src/Mailgun/Api/Message.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -16,26 +14,30 @@ use Mailgun\Exception\InvalidArgumentException;
 use Mailgun\Message\BatchMessage;
 use Mailgun\Model\Message\SendResponse;
 use Mailgun\Model\Message\ShowResponse;
-use Psr\Http\Message\ResponseInterface;

 /**
- * @see https://documentation.mailgun.com/en/latest/api-sending.html
- *
 * @author Tobias Nyholm <tobias.nyholm@gmail.com>
 */
 class Message extends HttpApi
 {
-    public function getBatchMessage(string $domain, bool $autoSend = true): BatchMessage
+    /**
+     * @param string $domain
+     * @param bool   $autoSend
+     *
+     * @return BatchMessage
+     */
+    public function getBatchMessage($domain, $autoSend = true)
    {
        return new BatchMessage($this, $domain, $autoSend);
    }

    /**
-     * @see https://documentation.mailgun.com/en/latest/api-sending.html#sending
+     * @param string $domain
+     * @param array  $params
     *
-     * @return SendResponse|ResponseInterface
+     * @return SendResponse
     */
-    public function send(string $domain, array $params)
+    public function send($domain, array $params)
    {
        Assert::string($domain);
        Assert::notEmpty($domain);
@ -57,24 +59,18 @@ class Message extends HttpApi
        }

        $postDataMultipart = array_merge($this->prepareMultipartParameters($params), $postDataMultipart);
-        try {
-            $response = $this->httpPostRaw(sprintf('/v3/%s/messages', $domain), $postDataMultipart);
-        } finally {
-            $this->closeResources($postDataMultipart);
-        }
+        $response = $this->httpPostRaw(sprintf('/v3/%s/messages', $domain), $postDataMultipart);

        return $this->hydrateResponse($response, SendResponse::class);
    }

    /**
-     * @see https://documentation.mailgun.com/en/latest/api-sending.html#sending
-     *
+     * @param string $domain
     * @param array  $recipients with all you send emails to. Including bcc and cc
     * @param string $message    Message filepath or content
-     *
-     * @return SendResponse|ResponseInterface
+     * @param array  $params
     */
-    public function sendMime(string $domain, array $recipients, string  $message, array $params)
+    public function sendMime($domain, array $recipients, $message, array $params)
    {
        Assert::string($domain);
        Assert::notEmpty($domain);
@ -85,7 +81,7 @@ class Message extends HttpApi
        $params['to'] = $recipients;
        $postDataMultipart = $this->prepareMultipartParameters($params);

-        if (strlen($message) < PHP_MAXPATHLEN && is_file($message)) {
+        if (is_file($message)) {
            $fileData = ['filePath' => $message];
        } else {
            $fileData = [
@ -94,11 +90,7 @@ class Message extends HttpApi
            ];
        }
        $postDataMultipart[] = $this->prepareFile('message', $fileData);
-        try {
-            $response = $this->httpPostRaw(sprintf('/v3/%s/messages.mime', $domain), $postDataMultipart);
-        } finally {
-            $this->closeResources($postDataMultipart);
-        }
+        $response = $this->httpPostRaw(sprintf('/v3/%s/messages.mime', $domain), $postDataMultipart);

        return $this->hydrateResponse($response, SendResponse::class);
    }
@ -106,13 +98,12 @@ class Message extends HttpApi
    /**
     * Get stored message.
     *
-     * @see https://documentation.mailgun.com/en/latest/api-sending.html#retrieving-stored-messages
+     * @param string $url
+     * @param bool   $rawMessage if true we will use "Accept: message/rfc2822" header
     *
-     * @param bool $rawMessage if true we will use "Accept: message/rfc2822" header
-     *
-     * @return ShowResponse|ResponseInterface
+     * @return ShowResponse
     */
-    public function show(string $url, bool $rawMessage = false)
+    public function show($url, $rawMessage = false)
    {
        Assert::notEmpty($url);

@ -127,22 +118,24 @@ class Message extends HttpApi
    }

    /**
-     * @param array $filePath array('fileContent' => 'content') or array('filePath' => '/foo/bar')
+     * Prepare a file.
+     *
+     * @param string $fieldName
+     * @param array  $filePath  array('fileContent' => 'content') or array('filePath' => '/foo/bar')
+     *
+     * @return array
     *
     * @throws InvalidArgumentException
     */
-    private function prepareFile(string $fieldName, array $filePath): array
+    private function prepareFile($fieldName, array $filePath)
    {
        $filename = isset($filePath['filename']) ? $filePath['filename'] : null;
-        $deleteRequired = false;

        if (isset($filePath['fileContent'])) {
            // File from memory
-            $filename = tempnam(sys_get_temp_dir(), "MAILGUN_TMP");
-            $resource = fopen($filename, 'r+');
+            $resource = fopen('php://temp', 'r+');
            fwrite($resource, $filePath['fileContent']);
            rewind($resource);
-            $deleteRequired = true;
        } elseif (isset($filePath['filePath'])) {
            // File form path
            $path = $filePath['filePath'];
@ -161,14 +154,17 @@ class Message extends HttpApi
            'name' => $fieldName,
            'content' => $resource,
            'filename' => $filename,
-            'deleteRequired' => $deleteRequired,
        ];
    }

    /**
     * Prepare multipart parameters. Make sure each POST parameter is split into an array with 'name' and 'content' keys.
+     *
+     * @param array $params
+     *
+     * @return array
     */
-    private function prepareMultipartParameters(array $params): array
+    private function prepareMultipartParameters(array $params)
    {
        $postDataMultipart = [];
        foreach ($params as $key => $value) {
@ -183,23 +179,4 @@ class Message extends HttpApi

        return $postDataMultipart;
    }
-
-    /**
-     * Close open resources.
-     */
-    private function closeResources(array $params): void
-    {
-        foreach ($params as $param) {
-            if (is_array($param) && array_key_exists('content', $param) && is_resource($param['content'])) {
-                fclose($param['content']);
-            }
-            if (is_array($param)) {
-                $isFile = array_key_exists('filename', $param) && is_file($param['filename']);
-                $deleteRequired = $param['deleteRequired'] ?? false;
-                if ($isFile && $deleteRequired) {
-                    unlink($param['filename']);
-                }
-            }
-        }
-    }
 }
--- a/src/Mailgun/Api/Pagination.php
+++ b/src/Mailgun/Api/Pagination.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -20,36 +18,62 @@ use Psr\Http\Message\ResponseInterface;
 */
 trait Pagination
 {
-    abstract protected function httpGet(string $path, array $parameters = [], array $requestHeaders = []): ResponseInterface;
+    abstract protected function httpGet($path, array $parameters = [], array $requestHeaders = []);

-    abstract protected function hydrateResponse(ResponseInterface $response, string $className);
+    abstract protected function hydrateResponse(ResponseInterface $response, $className);

-    public function nextPage(PagingProvider $response): ?PagingProvider
+    /**
+     * @param PagingProvider $response
+     *
+     * @return PagingProvider|null
+     */
+    public function nextPage(PagingProvider $response)
    {
        return $this->getPaginationUrl($response->getNextUrl(), get_class($response));
    }

-    public function previousPage(PagingProvider $response): ?PagingProvider
+    /**
+     * @param PagingProvider $response
+     *
+     * @return PagingProvider|null
+     */
+    public function previousPage(PagingProvider $response)
    {
        return $this->getPaginationUrl($response->getPreviousUrl(), get_class($response));
    }

-    public function firstPage(PagingProvider $response): ?PagingProvider
+    /**
+     * @param PagingProvider $response
+     *
+     * @return PagingProvider|null
+     */
+    public function firstPage(PagingProvider $response)
    {
        return $this->getPaginationUrl($response->getFirstUrl(), get_class($response));
    }

-    public function lastPage(PagingProvider $response): ?PagingProvider
+    /**
+     * @param PagingProvider $response
+     *
+     * @return PagingProvider|null
+     */
+    public function lastPage(PagingProvider $response)
    {
        return $this->getPaginationUrl($response->getLastUrl(), get_class($response));
    }

-    private function getPaginationUrl(string $url, string $class): ?PagingProvider
+    /**
+     * @param string $url
+     * @param string $class
+     *
+     * @return PagingProvider|null
+     */
+    private function getPaginationUrl($url, $class)
    {
        Assert::stringNotEmpty($class);

        if (empty($url)) {
-            return null;
+            return;
        }

        $response = $this->httpGet($url);
--- a/src/Mailgun/Api/Route.php
+++ b/src/Mailgun/Api/Route.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -12,14 +10,14 @@ declare(strict_types=1);
 namespace Mailgun\Api;

 use Mailgun\Assert;
-use Mailgun\Model\Route\CreateResponse;
-use Mailgun\Model\Route\DeleteResponse;
-use Mailgun\Model\Route\IndexResponse;
-use Mailgun\Model\Route\ShowResponse;
-use Mailgun\Model\Route\UpdateResponse;
+use Mailgun\Model\Route\Response\CreateResponse;
+use Mailgun\Model\Route\Response\DeleteResponse;
+use Mailgun\Model\Route\Response\IndexResponse;
+use Mailgun\Model\Route\Response\ShowResponse;
+use Mailgun\Model\Route\Response\UpdateResponse;

 /**
- * @see https://documentation.mailgun.com/api-routes.html
+ * {@link https://documentation.mailgun.com/api-routes.html}.
 *
 * @author David Garcia <me@davidgarcia.cat>
 */
@ -33,11 +31,12 @@ class Route extends HttpApi
     *
     * @return IndexResponse
     */
-    public function index(int $limit = 100, int $skip = 0)
+    public function index($limit = 100, $skip = 0)
    {
+        Assert::integer($limit);
+        Assert::integer($skip);
        Assert::greaterThan($limit, 0);
        Assert::greaterThanEq($skip, 0);
-        Assert::range($limit, 1, 1000);

        $params = [
            'limit' => $limit,
@ -56,7 +55,7 @@ class Route extends HttpApi
     *
     * @return ShowResponse
     */
-    public function show(string $routeId)
+    public function show($routeId)
    {
        Assert::stringNotEmpty($routeId);

@ -75,12 +74,15 @@ class Route extends HttpApi
     *
     * @return CreateResponse
     */
-    public function create(string $expression, array $actions, string $description, int $priority = 0)
+    public function create($expression, array $actions, $description, $priority = 0)
    {
+        Assert::string($expression);
        Assert::isArray($actions);
+        Assert::string($description);
+        Assert::integer($priority);

        $params = [
-            'priority' => (string) $priority,
+            'priority' => $priority,
            'expression' => $expression,
            'action' => $actions,
            'description' => $description,
@ -97,20 +99,20 @@ class Route extends HttpApi
     *
     * @param string      $routeId     Route ID returned by the Routes::index() method
     * @param string|null $expression  A filter expression like "match_recipient('.*@gmail.com')"
-     * @param array       $actions     Route action. This action is executed when the expression evaluates to True. Example: "forward('alice@example.com')"
+     * @param array|null  $actions     Route action. This action is executed when the expression evaluates to True. Example: "forward('alice@example.com')"
     * @param string|null $description An arbitrary string
     * @param int|null    $priority    Integer: smaller number indicates higher priority. Higher priority routes are handled first. Defaults to 0.
     *
     * @return UpdateResponse
     */
-    public function update(
-        string $routeId,
-        string $expression = null,
-        array $actions = [],
-        string $description = null,
-        int $priority = null
-    ) {
+    public function update($routeId, $expression = null, array $actions = [], $description = null, $priority = null)
+    {
        Assert::stringNotEmpty($routeId);
+        Assert::nullOrString($expression);
+        Assert::isArray($actions);
+        Assert::nullOrString($description);
+        Assert::nullOrInteger($priority);
+
        $params = [];

        if (!empty($expression)) {
@ -129,7 +131,7 @@ class Route extends HttpApi
        }

        if (!empty($priority)) {
-            $params['priority'] = (string) $priority;
+            $params['priority'] = $priority;
        }

        $response = $this->httpPut(sprintf('/v3/routes/%s', $routeId), $params);
@ -144,7 +146,7 @@ class Route extends HttpApi
     *
     * @return DeleteResponse
     */
-    public function delete(string $routeId)
+    public function delete($routeId)
    {
        Assert::stringNotEmpty($routeId);

--- a/src/Mailgun/Api/Stats.php
+++ b/src/Mailgun/Api/Stats.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -16,16 +14,19 @@ use Mailgun\Model\Stats\AllResponse;
 use Mailgun\Model\Stats\TotalResponse;

 /**
- * @see https://documentation.mailgun.com/en/latest/api-stats.html
+ * {@link https://documentation.mailgun.com/api-stats.html}.
 *
 * @author Tobias Nyholm <tobias.nyholm@gmail.com>
 */
 class Stats extends HttpApi
 {
    /**
+     * @param string $domain
+     * @param array  $params
+     *
     * @return TotalResponse|array
     */
-    public function total(string $domain, array $params = [])
+    public function total($domain, array $params = [])
    {
        Assert::stringNotEmpty($domain);

@ -35,9 +36,12 @@ class Stats extends HttpApi
    }

    /**
+     * @param $domain
+     * @param array $params
+     *
     * @return AllResponse|array
     */
-    public function all(string $domain, array $params = [])
+    public function all($domain, array $params = [])
    {
        Assert::stringNotEmpty($domain);

--- a/src/Mailgun/Api/Suppression.php
+++ b/src/Mailgun/Api/Suppression.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -11,12 +9,12 @@ declare(strict_types=1);

 namespace Mailgun\Api;

+use Http\Client\HttpClient;
 use Mailgun\Api\Suppression\Bounce;
 use Mailgun\Api\Suppression\Complaint;
 use Mailgun\Api\Suppression\Unsubscribe;
 use Mailgun\Hydrator\Hydrator;
-use Psr\Http\Client\ClientInterface;
-use Mailgun\HttpClient\RequestBuilder;
+use Mailgun\RequestBuilder;

 /**
 * @see https://documentation.mailgun.com/api-suppressions.html
@ -26,7 +24,7 @@ use Mailgun\HttpClient\RequestBuilder;
 class Suppression
 {
    /**
-     * @var ClientInterface
+     * @var HttpClient
     */
    private $httpClient;

@ -40,24 +38,38 @@ class Suppression
     */
    private $hydrator;

-    public function __construct(ClientInterface $httpClient, RequestBuilder $requestBuilder, Hydrator $hydrator)
+    /**
+     * @param HttpClient     $httpClient
+     * @param RequestBuilder $requestBuilder
+     * @param Hydrator       $hydrator
+     */
+    public function __construct(HttpClient $httpClient, RequestBuilder $requestBuilder, Hydrator $hydrator)
    {
        $this->httpClient = $httpClient;
        $this->requestBuilder = $requestBuilder;
        $this->hydrator = $hydrator;
    }

-    public function bounces(): Bounce
+    /**
+     * @return Bounce
+     */
+    public function bounces()
    {
        return new Bounce($this->httpClient, $this->requestBuilder, $this->hydrator);
    }

-    public function complaints(): Complaint
+    /**
+     * @return Complaint
+     */
+    public function complaints()
    {
        return new Complaint($this->httpClient, $this->requestBuilder, $this->hydrator);
    }

-    public function unsubscribes(): Unsubscribe
+    /**
+     * @return Unsubscribe
+     */
+    public function unsubscribes()
    {
        return new Unsubscribe($this->httpClient, $this->requestBuilder, $this->hydrator);
    }
--- a/src/Mailgun/Api/Suppression/Bounce.php
+++ b/src/Mailgun/Api/Suppression/Bounce.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -34,7 +32,7 @@ class Bounce extends HttpApi
     *
     * @return IndexResponse
     */
-    public function index(string $domain, int $limit = 100)
+    public function index($domain, $limit = 100)
    {
        Assert::stringNotEmpty($domain);
        Assert::range($limit, 1, 10000, '"Limit" parameter must be between 1 and 10000');
@ -54,7 +52,7 @@ class Bounce extends HttpApi
     *
     * @return ShowResponse
     */
-    public function show(string $domain, string $address)
+    public function show($domain, $address)
    {
        Assert::stringNotEmpty($domain);
        Assert::stringNotEmpty($address);
@ -71,7 +69,7 @@ class Bounce extends HttpApi
     *
     * @return CreateResponse
     */
-    public function create(string $domain, string $address, array $params = [])
+    public function create($domain, $address, array $params = [])
    {
        Assert::stringNotEmpty($domain);
        Assert::stringNotEmpty($address);
@ -89,7 +87,7 @@ class Bounce extends HttpApi
     *
     * @return DeleteResponse
     */
-    public function delete(string $domain, string $address)
+    public function delete($domain, $address)
    {
        Assert::stringNotEmpty($domain);
        Assert::stringNotEmpty($address);
@ -104,7 +102,7 @@ class Bounce extends HttpApi
     *
     * @return DeleteResponse
     */
-    public function deleteAll(string $domain)
+    public function deleteAll($domain)
    {
        Assert::stringNotEmpty($domain);

--- a/src/Mailgun/Api/Suppression/Complaint.php
+++ b/src/Mailgun/Api/Suppression/Complaint.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -34,7 +32,7 @@ class Complaint extends HttpApi
     *
     * @return IndexResponse
     */
-    public function index(string $domain, int $limit = 100)
+    public function index($domain, $limit = 100)
    {
        Assert::stringNotEmpty($domain);
        Assert::range($limit, 1, 10000, 'Limit parameter must be between 1 and 10000');
@ -54,7 +52,7 @@ class Complaint extends HttpApi
     *
     * @return ShowResponse
     */
-    public function show(string $domain, string $address)
+    public function show($domain, $address)
    {
        Assert::stringNotEmpty($domain);
        Assert::stringNotEmpty($address);
@ -70,14 +68,14 @@ class Complaint extends HttpApi
     *
     * @return CreateResponse
     */
-    public function create(string $domain, string $address, string $createdAt = null)
+    public function create($domain, $address, $createdAt = null)
    {
        Assert::stringNotEmpty($domain);
        Assert::stringNotEmpty($address);
+        Assert::stringNotEmpty($createdAt);

        $params['address'] = $address;
        if (null !== $createdAt) {
-            Assert::stringNotEmpty($createdAt);
            $params['created_at'] = $createdAt;
        }

@ -92,7 +90,7 @@ class Complaint extends HttpApi
     *
     * @return DeleteResponse
     */
-    public function delete(string $domain, string $address)
+    public function delete($domain, $address)
    {
        Assert::stringNotEmpty($domain);
        Assert::stringNotEmpty($address);
@ -107,7 +105,7 @@ class Complaint extends HttpApi
     *
     * @return DeleteResponse
     */
-    public function deleteAll(string $domain)
+    public function deleteAll($domain)
    {
        Assert::stringNotEmpty($domain);

--- a/src/Mailgun/Api/Suppression/Unsubscribe.php
+++ b/src/Mailgun/Api/Suppression/Unsubscribe.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -34,7 +32,7 @@ class Unsubscribe extends HttpApi
     *
     * @return IndexResponse
     */
-    public function index(string $domain, int $limit = 100)
+    public function index($domain, $limit = 100)
    {
        Assert::stringNotEmpty($domain);
        Assert::range($limit, 1, 10000, 'Limit parameter must be between 1 and 10000');
@ -54,7 +52,7 @@ class Unsubscribe extends HttpApi
     *
     * @return ShowResponse
     */
-    public function show(string $domain, string $address)
+    public function show($domain, $address)
    {
        Assert::stringNotEmpty($domain);
        Assert::stringNotEmpty($address);
@ -71,7 +69,7 @@ class Unsubscribe extends HttpApi
     *
     * @return CreateResponse
     */
-    public function create(string $domain, string $address, array $params = [])
+    public function create($domain, $address, array $params = [])
    {
        Assert::stringNotEmpty($domain);
        Assert::stringNotEmpty($address);
@ -84,24 +82,17 @@ class Unsubscribe extends HttpApi
    }

    /**
-     * @param string      $domain  Domain to delete unsubscribe for
-     * @param string      $address Unsubscribe address
-     * @param string|null $tag     Unsubscribe tag
+     * @param string $domain  Domain to delete unsubscribe for
+     * @param string $address Unsubscribe address
     *
     * @return DeleteResponse
     */
-    public function delete(string $domain, string $address, string $tag = null)
+    public function delete($domain, $address)
    {
        Assert::stringNotEmpty($domain);
        Assert::stringNotEmpty($address);
-        Assert::nullOrStringNotEmpty($tag);

-        $params = [];
-        if (!is_null($tag)) {
-            $params['tag'] = $tag;
-        }
-
-        $response = $this->httpDelete(sprintf('/v3/%s/unsubscribes/%s', $domain, $address), $params);
+        $response = $this->httpDelete(sprintf('/v3/%s/unsubscribes/%s', $domain, $address));

        return $this->hydrateResponse($response, DeleteResponse::class);
    }
@ -111,7 +102,7 @@ class Unsubscribe extends HttpApi
     *
     * @return DeleteResponse
     */
-    public function deleteAll(string $domain)
+    public function deleteAll($domain)
    {
        Assert::stringNotEmpty($domain);

--- a/src/Mailgun/Api/Tag.php
+++ b/src/Mailgun/Api/Tag.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -12,18 +10,15 @@ declare(strict_types=1);
 namespace Mailgun\Api;

 use Mailgun\Assert;
-use Mailgun\Model\Tag\CountryResponse;
 use Mailgun\Model\Tag\DeleteResponse;
-use Mailgun\Model\Tag\DeviceResponse;
 use Mailgun\Model\Tag\IndexResponse;
-use Mailgun\Model\Tag\ProviderResponse;
 use Mailgun\Model\Tag\ShowResponse;
 use Mailgun\Model\Tag\StatisticsResponse;
 use Mailgun\Model\Tag\UpdateResponse;
 use Psr\Http\Message\ResponseInterface;

 /**
- * @see https://documentation.mailgun.com/en/latest/api-tags.html
+ * {@link https://documentation.mailgun.com/api-tags.html#tags}.
 *
 * @author Tobias Nyholm <tobias.nyholm@gmail.com>
 */
@ -31,14 +26,16 @@ class Tag extends HttpApi
 {
    /**
     * Returns a list of tags.
-
+     *
+     * @param string $domain
+     * @param int    $limit
     *
     * @return IndexResponse|ResponseInterface
     */
-    public function index(string $domain, int $limit = 100)
+    public function index($domain, $limit = 100)
    {
        Assert::stringNotEmpty($domain);
-        Assert::range($limit, 1, 1000);
+        Assert::integer($limit);

        $params = [
            'limit' => $limit,
@ -52,9 +49,12 @@ class Tag extends HttpApi
    /**
     * Returns a single tag.
     *
+     * @param string $domain Name of the domain
+     * @param string $tag
+     *
     * @return ShowResponse|ResponseInterface
     */
-    public function show(string $domain, string $tag)
+    public function show($domain, $tag)
    {
        Assert::stringNotEmpty($domain);
        Assert::stringNotEmpty($tag);
@ -67,13 +67,17 @@ class Tag extends HttpApi
    /**
     * Update a tag.
     *
+     * @param string $domain
+     * @param string $tag
+     * @param string $description
     *
     * @return UpdateResponse|ResponseInterface
     */
-    public function update(string $domain, string $tag, string $description)
+    public function update($domain, $tag, $description)
    {
        Assert::stringNotEmpty($domain);
        Assert::stringNotEmpty($tag);
+        Assert::string($description);

        $params = [
            'description' => $description,
@ -87,13 +91,17 @@ class Tag extends HttpApi
    /**
     * Returns statistics for a single tag.
     *
+     * @param string $domain Name of the domain
+     * @param string $tag
+     * @param array  $params
     *
     * @return StatisticsResponse|ResponseInterface
     */
-    public function stats(string $domain, string $tag, array $params)
+    public function stats($domain, $tag, array $params)
    {
        Assert::stringNotEmpty($domain);
        Assert::stringNotEmpty($tag);
+        Assert::isArray($params);

        $response = $this->httpGet(sprintf('/v3/%s/tags/%s/stats', $domain, $tag), $params);

@ -103,10 +111,12 @@ class Tag extends HttpApi
    /**
     * Removes a tag from the account.
     *
+     * @param string $domain Name of the domain
+     * @param string $tag
     *
     * @return DeleteResponse|ResponseInterface
     */
-    public function delete(string $domain, string $tag)
+    public function delete($domain, $tag)
    {
        Assert::stringNotEmpty($domain);
        Assert::stringNotEmpty($tag);
@ -115,43 +125,4 @@ class Tag extends HttpApi

        return $this->hydrateResponse($response, DeleteResponse::class);
    }
-
-    /**
-     * @return CountryResponse|ResponseInterface
-     */
-    public function countries(string $domain, string $tag)
-    {
-        Assert::stringNotEmpty($domain);
-        Assert::stringNotEmpty($tag);
-
-        $response = $this->httpGet(sprintf('/v3/%s/tags/%s/stats/aggregates/countries', $domain, $tag));
-
-        return $this->hydrateResponse($response, CountryResponse::class);
-    }
-
-    /**
-     * @return ProviderResponse|ResponseInterface
-     */
-    public function providers(string $domain, string $tag)
-    {
-        Assert::stringNotEmpty($domain);
-        Assert::stringNotEmpty($tag);
-
-        $response = $this->httpGet(sprintf('/v3/%s/tags/%s/stats/aggregates/providers', $domain, $tag));
-
-        return $this->hydrateResponse($response, ProviderResponse::class);
-    }
-
-    /**
-     * @return DeviceResponse|ResponseInterface
-     */
-    public function devices(string $domain, string $tag)
-    {
-        Assert::stringNotEmpty($domain);
-        Assert::stringNotEmpty($tag);
-
-        $response = $this->httpGet(sprintf('/v3/%s/tags/%s/stats/aggregates/devices', $domain, $tag));
-
-        return $this->hydrateResponse($response, DeviceResponse::class);
-    }
 }
--- a/src/Mailgun/Api/Webhook.php
+++ b/src/Mailgun/Api/Webhook.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -11,6 +9,7 @@ declare(strict_types=1);

 namespace Mailgun\Api;

+use Http\Client\HttpClient;
 use Mailgun\Assert;
 use Mailgun\Hydrator\Hydrator;
 use Mailgun\Model\Webhook\CreateResponse;
@ -18,13 +17,9 @@ use Mailgun\Model\Webhook\DeleteResponse;
 use Mailgun\Model\Webhook\IndexResponse;
 use Mailgun\Model\Webhook\ShowResponse;
 use Mailgun\Model\Webhook\UpdateResponse;
-use Mailgun\HttpClient\RequestBuilder;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Client\ClientInterface;
+use Mailgun\RequestBuilder;

 /**
- * @see https://documentation.mailgun.com/en/latest/api-webhooks.html
- *
 * @author Tobias Nyholm <tobias.nyholm@gmail.com>
 */
 class Webhook extends HttpApi
@ -34,7 +29,13 @@ class Webhook extends HttpApi
     */
    private $apiKey;

-    public function __construct(ClientInterface $httpClient, RequestBuilder $requestBuilder, Hydrator $hydrator, string $apiKey)
+    /**
+     * @param HttpClient     $httpClient
+     * @param RequestBuilder $requestBuilder
+     * @param Hydrator       $hydrator
+     * @param string         $apiKey
+     */
+    public function __construct(HttpClient $httpClient, RequestBuilder $requestBuilder, Hydrator $hydrator, $apiKey)
    {
        parent::__construct($httpClient, $requestBuilder, $hydrator);
        $this->apiKey = $apiKey;
@ -45,8 +46,14 @@ class Webhook extends HttpApi
     *
     * If this function returns FALSE, you must not process the request.
     * You should reject the request with status code 403 Forbidden.
+     *
+     * @param int    $timestamp
+     * @param string $token
+     * @param string $signature
+     *
+     * @return bool
     */
-    public function verifyWebhookSignature(int $timestamp, string $token, string $signature): bool
+    public function verifyWebhookSignature($timestamp, $token, $signature)
    {
        if (empty($timestamp) || empty($token) || empty($signature)) {
            return false;
@ -63,9 +70,11 @@ class Webhook extends HttpApi
    }

    /**
-     * @return IndexResponse|ResponseInterface
+     * @param string $domain
+     *
+     * @return IndexResponse
     */
-    public function index(string $domain)
+    public function index($domain)
    {
        Assert::notEmpty($domain);
        $response = $this->httpGet(sprintf('/v3/domains/%s/webhooks', $domain));
@ -74,9 +83,12 @@ class Webhook extends HttpApi
    }

    /**
-     * @return ShowResponse|ResponseInterface
+     * @param string $domain
+     * @param string $webhook
+     *
+     * @return ShowResponse
     */
-    public function show(string $domain, string $webhook)
+    public function show($domain, $webhook)
    {
        Assert::notEmpty($domain);
        Assert::notEmpty($webhook);
@ -86,9 +98,13 @@ class Webhook extends HttpApi
    }

    /**
-     * @return CreateResponse|ResponseInterface
+     * @param string $domain
+     * @param string $id
+     * @param string $url
+     *
+     * @return CreateResponse
     */
-    public function create(string $domain, string $id, string $url)
+    public function create($domain, $id, $url)
    {
        Assert::notEmpty($domain);
        Assert::notEmpty($id);
@ -105,9 +121,13 @@ class Webhook extends HttpApi
    }

    /**
-     * @return UpdateResponse|ResponseInterface
+     * @param string $domain
+     * @param string $id
+     * @param string $url
+     *
+     * @return UpdateResponse
     */
-    public function update(string $domain, string $id, string $url)
+    public function update($domain, $id, $url)
    {
        Assert::notEmpty($domain);
        Assert::notEmpty($id);
@ -123,9 +143,12 @@ class Webhook extends HttpApi
    }

    /**
-     * @return DeleteResponse|ResponseInterface
+     * @param string $domain
+     * @param string $id
+     *
+     * @return DeleteResponse
     */
-    public function delete(string $domain, string $id)
+    public function delete($domain, $id)
    {
        Assert::notEmpty($domain);
        Assert::notEmpty($id);
--- a/src/Mailgun/Assert.php
+++ b/src/Mailgun/Assert.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
--- a/src/Mailgun/Connection/Exceptions/GenericHTTPError.php
+++ b/src/Mailgun/Connection/Exceptions/GenericHTTPError.php
@ -0,0 +1,40 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Connection\Exceptions;
+
+use Mailgun\Exception;
+
+/**
+ * @deprecated Will be removed in 3.0
+ */
+class GenericHTTPError extends \Exception implements Exception
+{
+    protected $httpResponseCode;
+
+    protected $httpResponseBody;
+
+    public function __construct($message = null, $response_code = null, $response_body = null, $code = 0, \Exception $previous = null)
+    {
+        parent::__construct($message, $code, $previous);
+
+        $this->httpResponseCode = $response_code;
+        $this->httpResponseBody = $response_body;
+    }
+
+    public function getHttpResponseCode()
+    {
+        return $this->httpResponseCode;
+    }
+
+    public function getHttpResponseBody()
+    {
+        return $this->httpResponseBody;
+    }
+}
--- a/src/Mailgun/Connection/Exceptions/InvalidCredentials.php
+++ b/src/Mailgun/Connection/Exceptions/InvalidCredentials.php
@ -0,0 +1,19 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Connection\Exceptions;
+
+use Mailgun\Exception;
+
+/**
+ * @deprecated Will be removed in 3.0
+ */
+class InvalidCredentials extends \Exception implements Exception
+{
+}
--- a/src/Mailgun/Connection/Exceptions/MissingEndpoint.php
+++ b/src/Mailgun/Connection/Exceptions/MissingEndpoint.php
@ -0,0 +1,19 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Connection\Exceptions;
+
+use Mailgun\Exception;
+
+/**
+ * @deprecated Will be removed in 3.0
+ */
+class MissingEndpoint extends \Exception implements Exception
+{
+}
--- a/src/Mailgun/Connection/Exceptions/MissingRequiredParameters.php
+++ b/src/Mailgun/Connection/Exceptions/MissingRequiredParameters.php
@ -0,0 +1,19 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Connection\Exceptions;
+
+use Mailgun\Exception;
+
+/**
+ * @deprecated Will be removed in 3.0
+ */
+class MissingRequiredParameters extends \Exception implements Exception
+{
+}
--- a/src/Mailgun/Connection/Exceptions/NoDomainsConfigured.php
+++ b/src/Mailgun/Connection/Exceptions/NoDomainsConfigured.php
@ -0,0 +1,19 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Connection\Exceptions;
+
+use Mailgun\Exception;
+
+/**
+ * @deprecated Will be removed in 3.0
+ */
+class NoDomainsConfigured extends \Exception implements Exception
+{
+}
--- a/src/Mailgun/Connection/RestClient.php
+++ b/src/Mailgun/Connection/RestClient.php
@ -0,0 +1,379 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Connection;
+
+use Http\Client\HttpClient;
+use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\MessageFactoryDiscovery;
+use Http\Message\MultipartStream\MultipartStreamBuilder;
+use Mailgun\Connection\Exceptions\GenericHTTPError;
+use Mailgun\Connection\Exceptions\InvalidCredentials;
+use Mailgun\Connection\Exceptions\MissingEndpoint;
+use Mailgun\Connection\Exceptions\MissingRequiredParameters;
+use Mailgun\Constants\Api;
+use Mailgun\Constants\ExceptionMessages;
+use Psr\Http\Message\ResponseInterface;
+
+/**
+ * This class is a wrapper for the HTTP client.
+ *
+ * @deprecated Will be removed in 3.0
+ */
+class RestClient
+{
+    /**
+     * Your API key.
+     *
+     * @var string
+     */
+    private $apiKey;
+
+    /**
+     * @var HttpClient
+     */
+    protected $httpClient;
+
+    /**
+     * @var string
+     */
+    protected $apiHost;
+
+    /**
+     * The version of the API to use.
+     *
+     * @var string
+     */
+    protected $apiVersion = 'v2';
+
+    /**
+     * If we should use SSL or not.
+     *
+     * @var bool
+     *
+     * @deprecated To be removed in 3.0
+     */
+    protected $sslEnabled = true;
+
+    /**
+     * @param string     $apiKey
+     * @param string     $apiHost
+     * @param HttpClient $httpClient
+     */
+    public function __construct($apiKey, $apiHost, HttpClient $httpClient = null)
+    {
+        $this->apiKey = $apiKey;
+        $this->apiHost = $apiHost;
+        $this->httpClient = $httpClient;
+    }
+
+    /**
+     * @param string $method
+     * @param string $uri
+     * @param mixed  $body
+     * @param array  $files
+     * @param array  $headers
+     *
+     * @throws GenericHTTPError
+     * @throws InvalidCredentials
+     * @throws MissingEndpoint
+     * @throws MissingRequiredParameters
+     *
+     * @return \stdClass
+     */
+    protected function send($method, $uri, $body = null, $files = [], array $headers = [])
+    {
+        $headers['User-Agent'] = Api::SDK_USER_AGENT.'/'.Api::SDK_VERSION;
+        $headers['Authorization'] = 'Basic '.base64_encode(sprintf('%s:%s', Api::API_USER, $this->apiKey));
+
+        if (!empty($files)) {
+            $builder = new MultipartStreamBuilder();
+            foreach ($files as $file) {
+                $builder->addResource($file['name'], $file['contents'], $file);
+            }
+            $body = $builder->build();
+            $headers['Content-Type'] = 'multipart/form-data; boundary="'.$builder->getBoundary().'"';
+        } elseif (is_array($body)) {
+            $body = http_build_query($body);
+            $headers['Content-Type'] = 'application/x-www-form-urlencoded';
+        }
+
+        $request = MessageFactoryDiscovery::find()->createRequest($method, $this->getApiUrl($uri), $headers, $body);
+        $response = $this->getHttpClient()->sendRequest($request);
+
+        return $this->responseHandler($response);
+    }
+
+    /**
+     * @param string $url
+     *
+     * @throws GenericHTTPError
+     * @throws InvalidCredentials
+     * @throws MissingEndpoint
+     * @throws MissingRequiredParameters
+     *
+     * @return \stdClass
+     */
+    public function getAttachment($url)
+    {
+        $headers['User-Agent'] = Api::SDK_USER_AGENT.'/'.Api::SDK_VERSION;
+        $headers['Authorization'] = 'Basic '.base64_encode(sprintf('%s:%s', Api::API_USER, $this->apiKey));
+        $request = MessageFactoryDiscovery::find()->createRequest('get', $url, $headers);
+        $response = HttpClientDiscovery::find()->sendRequest($request);
+
+        return $this->responseHandler($response);
+    }
+
+    /**
+     * @param string $endpointUrl
+     * @param array  $postData
+     * @param array  $files
+     *
+     * @throws GenericHTTPError
+     * @throws InvalidCredentials
+     * @throws MissingEndpoint
+     * @throws MissingRequiredParameters
+     *
+     * @return \stdClass
+     */
+    public function post($endpointUrl, array $postData = [], $files = [])
+    {
+        $postFiles = [];
+
+        $fields = ['message', 'attachment', 'inline'];
+        foreach ($fields as $fieldName) {
+            if (isset($files[$fieldName])) {
+                if (is_array($files[$fieldName])) {
+                    foreach ($files[$fieldName] as $file) {
+                        $postFiles[] = $this->prepareFile($fieldName, $file);
+                    }
+                } else {
+                    $postFiles[] = $this->prepareFile($fieldName, $files[$fieldName]);
+                }
+            }
+        }
+
+        $postDataMultipart = [];
+        foreach ($postData as $key => $value) {
+            if (is_array($value)) {
+                foreach ($value as $subValue) {
+                    $postDataMultipart[] = [
+                        'name' => $key,
+                        'contents' => $subValue,
+                    ];
+                }
+            } else {
+                $postDataMultipart[] = [
+                    'name' => $key,
+                    'contents' => $value,
+                ];
+            }
+        }
+
+        return $this->send('POST', $endpointUrl, [], array_merge($postDataMultipart, $postFiles));
+    }
+
+    /**
+     * @param string $endpointUrl
+     * @param array  $queryString
+     *
+     * @throws GenericHTTPError
+     * @throws InvalidCredentials
+     * @throws MissingEndpoint
+     * @throws MissingRequiredParameters
+     *
+     * @return \stdClass
+     */
+    public function get($endpointUrl, $queryString = [])
+    {
+        return $this->send('GET', $endpointUrl.'?'.http_build_query($queryString));
+    }
+
+    /**
+     * @param string $endpointUrl
+     *
+     * @throws GenericHTTPError
+     * @throws InvalidCredentials
+     * @throws MissingEndpoint
+     * @throws MissingRequiredParameters
+     *
+     * @return \stdClass
+     */
+    public function delete($endpointUrl)
+    {
+        return $this->send('DELETE', $endpointUrl);
+    }
+
+    /**
+     * @param string $endpointUrl
+     * @param mixed  $putData
+     *
+     * @throws GenericHTTPError
+     * @throws InvalidCredentials
+     * @throws MissingEndpoint
+     * @throws MissingRequiredParameters
+     *
+     * @return \stdClass
+     */
+    public function put($endpointUrl, $putData)
+    {
+        return $this->send('PUT', $endpointUrl, $putData);
+    }
+
+    /**
+     * @param ResponseInterface $responseObj
+     *
+     * @throws GenericHTTPError
+     * @throws InvalidCredentials
+     * @throws MissingEndpoint
+     * @throws MissingRequiredParameters
+     *
+     * @return \stdClass
+     */
+    public function responseHandler(ResponseInterface $responseObj)
+    {
+        $httpResponseCode = (int) $responseObj->getStatusCode();
+
+        switch ($httpResponseCode) {
+        case 200:
+            $data = (string) $responseObj->getBody();
+            $jsonResponseData = json_decode($data, false);
+            $result = new \stdClass();
+            // return response data as json if possible, raw if not
+            $result->http_response_body = $data && null === $jsonResponseData ? $data : $jsonResponseData;
+            $result->http_response_code = $httpResponseCode;
+
+            return $result;
+        case 400:
+            throw new MissingRequiredParameters(ExceptionMessages::EXCEPTION_MISSING_REQUIRED_PARAMETERS.$this->getResponseExceptionMessage($responseObj));
+        case 401:
+            throw new InvalidCredentials(ExceptionMessages::EXCEPTION_INVALID_CREDENTIALS);
+        case 404:
+            throw new MissingEndpoint(ExceptionMessages::EXCEPTION_MISSING_ENDPOINT.$this->getResponseExceptionMessage($responseObj));
+        default:
+            throw new GenericHTTPError(ExceptionMessages::EXCEPTION_GENERIC_HTTP_ERROR, $httpResponseCode, $responseObj->getBody());
+        }
+    }
+
+    /**
+     * @param ResponseInterface $responseObj
+     *
+     * @return string
+     */
+    protected function getResponseExceptionMessage(ResponseInterface $responseObj)
+    {
+        $body = (string) $responseObj->getBody();
+        $response = json_decode($body);
+        if (JSON_ERROR_NONE == json_last_error() && isset($response->message)) {
+            return ' '.$response->message;
+        }
+
+        return '';
+    }
+
+    /**
+     * Prepare a file for the postBody.
+     *
+     * @param string       $fieldName
+     * @param string|array $filePath
+     *
+     * @return array
+     */
+    protected function prepareFile($fieldName, $filePath)
+    {
+        $filename = null;
+
+        if (is_array($filePath) && isset($filePath['fileContent'])) {
+            // File from memory
+            $filename = $filePath['filename'];
+            $resource = fopen('php://temp', 'r+');
+            fwrite($resource, $filePath['fileContent']);
+            rewind($resource);
+        } else {
+            // Backward compatibility code
+            if (is_array($filePath) && isset($filePath['filePath'])) {
+                $filename = $filePath['remoteName'];
+                $filePath = $filePath['filePath'];
+            }
+
+            // Remove leading @ symbol
+            if (0 === strpos($filePath, '@')) {
+                $filePath = substr($filePath, 1);
+            }
+
+            $resource = fopen($filePath, 'r');
+        }
+
+        return [
+            'name' => $fieldName,
+            'contents' => $resource,
+            'filename' => $filename,
+        ];
+    }
+
+    /**
+     * @return HttpClient
+     */
+    protected function getHttpClient()
+    {
+        if (null === $this->httpClient) {
+            $this->httpClient = HttpClientDiscovery::find();
+        }
+
+        return $this->httpClient;
+    }
+
+    /**
+     * @param string $uri
+     *
+     * @return string
+     */
+    private function getApiUrl($uri)
+    {
+        return $this->generateEndpoint($this->apiHost, $this->apiVersion, $this->sslEnabled).$uri;
+    }
+
+    /**
+     * @param string $apiEndpoint
+     * @param string $apiVersion
+     * @param bool   $ssl
+     *
+     * @return string
+     */
+    private function generateEndpoint($apiEndpoint, $apiVersion, $ssl)
+    {
+        return ($ssl ? 'https://' : 'http://').$apiEndpoint.'/'.$apiVersion.'/';
+    }
+
+    /**
+     * @param string $apiVersion
+     *
+     * @return RestClient
+     */
+    public function setApiVersion($apiVersion)
+    {
+        $this->apiVersion = $apiVersion;
+
+        return $this;
+    }
+
+    /**
+     * @param bool $sslEnabled
+     *
+     * @return RestClient
+     *
+     * @deprecated To be removed in 3.0
+     */
+    public function setSslEnabled($sslEnabled)
+    {
+        $this->sslEnabled = $sslEnabled;
+
+        return $this;
+    }
+}
--- a/src/Mailgun/Constants/Api.php
+++ b/src/Mailgun/Constants/Api.php
@ -0,0 +1,30 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Constants;
+
+/**
+ * @deprecated Will be removed in 3.0
+ */
+class Api
+{
+    const API_USER = 'api';
+
+    const SDK_VERSION = '1.7';
+
+    const SDK_USER_AGENT = 'mailgun-sdk-php';
+
+    const RECIPIENT_COUNT_LIMIT = 1000;
+
+    const CAMPAIGN_ID_LIMIT = 3;
+
+    const TAG_LIMIT = 3;
+
+    const DEFAULT_TIME_ZONE = 'UTC';
+}
--- a/src/Mailgun/Constants/ExceptionMessages.php
+++ b/src/Mailgun/Constants/ExceptionMessages.php
@ -0,0 +1,40 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Constants;
+
+/**
+ * @deprecated Will be removed in 3.0
+ */
+class ExceptionMessages
+{
+    const EXCEPTION_INVALID_CREDENTIALS = 'Your credentials are incorrect.';
+
+    const EXCEPTION_GENERIC_HTTP_ERROR = 'An HTTP Error has occurred! Check your network connection and try again.';
+
+    const EXCEPTION_MISSING_REQUIRED_PARAMETERS = 'The parameters passed to the API were invalid. Check your inputs!';
+
+    const EXCEPTION_MISSING_REQUIRED_MIME_PARAMETERS = 'The parameters passed to the API were invalid. Check your inputs!';
+
+    const EXCEPTION_MISSING_ENDPOINT = "The endpoint you've tried to access does not exist. Check if the domain matches the domain you have configure on Mailgun.";
+
+    const TOO_MANY_RECIPIENTS = "You've exceeded the maximum recipient count (1,000) on the to field with autosend disabled.";
+
+    const INVALID_PARAMETER_NON_ARRAY = "The parameter you've passed in position 2 must be an array.";
+
+    const INVALID_PARAMETER_ATTACHMENT = 'Attachments must be passed with an "@" preceding the file path. Web resources not supported.';
+
+    const INVALID_PARAMETER_INLINE = 'Inline images must be passed with an "@" preceding the file path. Web resources not supported.';
+
+    const TOO_MANY_PARAMETERS_CAMPAIGNS = "You've exceeded the maximum (3) campaigns for a single message.";
+
+    const TOO_MANY_PARAMETERS_TAGS = "You've exceeded the maximum (3) tags for a single message.";
+
+    const TOO_MANY_PARAMETERS_RECIPIENT = "You've exceeded the maximum recipient count (1,000) on the to field with autosend disabled.";
+}
--- a/src/Mailgun/Exception.php
+++ b/src/Mailgun/Exception.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -16,6 +14,6 @@ namespace Mailgun;
 *
 * @author Tobias Nyholm <tobias.nyholm@gmail.com>
 */
-interface Exception extends \Throwable
+interface Exception
 {
 }
--- a/src/Mailgun/Exception/HttpClientException.php
+++ b/src/Mailgun/Exception/HttpClientException.php
@ -0,0 +1,104 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Exception;
+
+use Mailgun\Exception;
+use Psr\Http\Message\ResponseInterface;
+
+/**
+ * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ */
+final class HttpClientException extends \RuntimeException implements Exception
+{
+    /**
+     * @var ResponseInterface|null
+     */
+    private $response;
+
+    /**
+     * @var array
+     */
+    private $responseBody;
+
+    /**
+     * @var int
+     */
+    private $responseCode;
+
+    /**
+     * @param string                 $message
+     * @param int                    $code
+     * @param ResponseInterface|null $response
+     */
+    public function __construct($message, $code, ResponseInterface $response = null)
+    {
+        parent::__construct($message, $code);
+
+        if ($response) {
+            $this->response = $response;
+            $this->responseCode = $response->getStatusCode();
+            $body = $response->getBody()->__toString();
+            if (0 !== strpos($response->getHeaderLine('Content-Type'), 'application/json')) {
+                $this->responseBody['message'] = $body;
+            } else {
+                $this->responseBody = json_decode($body, true);
+            }
+        }
+    }
+
+    public static function badRequest(ResponseInterface $response = null)
+    {
+        return new self('The parameters passed to the API were invalid. Check your inputs!', 400, $response);
+    }
+
+    public static function unauthorized(ResponseInterface $response = null)
+    {
+        return new self('Your credentials are incorrect.', 401, $response);
+    }
+
+    public static function requestFailed(ResponseInterface $response = null)
+    {
+        return new self('Parameters were valid but request failed. Try again.', 402, $response);
+    }
+
+    public static function notFound(ResponseInterface $response = null)
+    {
+        return new self('The endpoint you have tried to access does not exist. Check if the domain matches the domain you have configure on Mailgun.', 404, $response);
+    }
+
+    public static function payloadTooLarge(ResponseInterface $response = null)
+    {
+        return new self('Payload too large, your total attachment size is too big.', 413, $response);
+    }
+
+    /**
+     * @return ResponseInterface
+     */
+    public function getResponse()
+    {
+        return $this->response;
+    }
+
+    /**
+     * @return array
+     */
+    public function getResponseBody()
+    {
+        return $this->responseBody;
+    }
+
+    /**
+     * @return int
+     */
+    public function getResponseCode()
+    {
+        return $this->responseCode;
+    }
+}
--- a/src/Mailgun/Exception/HttpServerException.php
+++ b/src/Mailgun/Exception/HttpServerException.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -18,17 +16,17 @@ use Mailgun\Exception;
 */
 final class HttpServerException extends \RuntimeException implements Exception
 {
-    public static function serverError(int $httpStatus = 500)
+    public static function serverError($httpStatus = 500)
    {
        return new self('An unexpected error occurred at Mailgun\'s servers. Try again later and contact support if the error still exists.', $httpStatus);
    }

-    public static function networkError(\Throwable $previous)
+    public static function networkError(\Exception $previous)
    {
        return new self('Mailgun\'s servers are currently unreachable.', 0, $previous);
    }

-    public static function unknownHttpResponseCode(int $code)
+    public static function unknownHttpResponseCode($code)
    {
        return new self(sprintf('Unknown HTTP response code ("%d") received from the API server', $code));
    }
--- a/src/Mailgun/Exception/HydrationException.php
+++ b/src/Mailgun/Exception/HydrationException.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
--- a/src/Mailgun/Exception/InvalidArgumentException.php
+++ b/src/Mailgun/Exception/InvalidArgumentException.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
--- a/src/Mailgun/Exception/UnknownErrorException.php
+++ b/src/Mailgun/Exception/UnknownErrorException.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
--- a/src/Mailgun/HttpClient/Plugin/History.php
+++ b/src/Mailgun/HttpClient/Plugin/History.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -12,6 +10,7 @@ declare(strict_types=1);
 namespace Mailgun\HttpClient\Plugin;

 use Http\Client\Common\Plugin\Journal;
+use Http\Client\Exception;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;

@ -22,7 +21,6 @@ use Psr\Http\Message\ResponseInterface;
 */
 final class History implements Journal
 {
-    use HistoryTrait;
    /**
     * @var ResponseInterface
     */
@ -40,4 +38,8 @@ final class History implements Journal
    {
        $this->lastResponse = $response;
    }
+
+    public function addFailure(RequestInterface $request, Exception $exception)
+    {
+    }
 }
--- a/src/Mailgun/HttpClient/Plugin/ReplaceUriPlugin.php
+++ b/src/Mailgun/HttpClient/Plugin/ReplaceUriPlugin.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -22,19 +20,23 @@ use Psr\Http\Message\UriInterface;
 */
 final class ReplaceUriPlugin implements Plugin
 {
-    use Plugin\VersionBridgePlugin;
-
    /**
     * @var UriInterface
     */
    private $uri;

+    /**
+     * @param UriInterface $uri
+     */
    public function __construct(UriInterface $uri)
    {
        $this->uri = $uri;
    }

-    public function doHandleRequest(RequestInterface $request, callable $next, callable $first)
+    /**
+     * {@inheritdoc}
+     */
+    public function handleRequest(RequestInterface $request, callable $next, callable $first)
    {
        $request = $request->withUri($this->uri);

--- a/src/HttpClient/HttpClientConfigurator.php
+++ b/src/HttpClient/HttpClientConfigurator.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -9,16 +7,16 @@ declare(strict_types=1);
 * of the MIT license. See the LICENSE file for details.
 */

-namespace Mailgun\HttpClient;
+namespace Mailgun;

-use Http\Client\Common\Plugin;
+use Http\Client\HttpClient;
 use Http\Client\Common\PluginClient;
-use Http\Discovery\Psr17FactoryDiscovery;
-use Http\Discovery\Psr18ClientDiscovery;
+use Http\Discovery\HttpClientDiscovery;
+use Http\Discovery\UriFactoryDiscovery;
+use Http\Message\UriFactory;
+use Http\Client\Common\Plugin;
 use Mailgun\HttpClient\Plugin\History;
 use Mailgun\HttpClient\Plugin\ReplaceUriPlugin;
-use Psr\Http\Client\ClientInterface;
-use Psr\Http\Message\UriFactoryInterface;

 /**
 * Configure a HTTP client.
@ -45,12 +43,12 @@ final class HttpClientConfigurator
    private $apiKey;

    /**
-     * @var UriFactoryInterface
+     * @var UriFactory
     */
    private $uriFactory;

    /**
-     * @var ClientInterface
+     * @var HttpClient
     */
    private $httpClient;

@ -64,7 +62,10 @@ final class HttpClientConfigurator
        $this->responseHistory = new History();
    }

-    public function createConfiguredClient(): PluginClient
+    /**
+     * @return PluginClient
+     */
+    public function createConfiguredClient()
    {
        $plugins = [
            new Plugin\AddHostPlugin($this->getUriFactory()->createUri($this->endpoint)),
@ -82,65 +83,102 @@ final class HttpClientConfigurator
        return new PluginClient($this->getHttpClient(), $plugins);
    }

-    public function setDebug(bool $debug): self
+    /**
+     * @param bool $debug
+     *
+     * @return HttpClientConfigurator
+     */
+    public function setDebug($debug)
    {
        $this->debug = $debug;

        return $this;
    }

-    public function setEndpoint(string $endpoint): self
+    /**
+     * @param string $endpoint
+     *
+     * @return HttpClientConfigurator
+     */
+    public function setEndpoint($endpoint)
    {
        $this->endpoint = $endpoint;

        return $this;
    }

-    public function getApiKey(): string
+    /**
+     * @return string
+     */
+    public function getApiKey()
    {
        return $this->apiKey;
    }

-    public function setApiKey(string $apiKey): self
+    /**
+     * @param string $apiKey
+     *
+     * @return HttpClientConfigurator
+     */
+    public function setApiKey($apiKey)
    {
        $this->apiKey = $apiKey;

        return $this;
    }

-    private function getUriFactory(): UriFactoryInterface
+    /**
+     * @return UriFactory
+     */
+    private function getUriFactory()
    {
        if (null === $this->uriFactory) {
-            $this->uriFactory = Psr17FactoryDiscovery::findUrlFactory();
+            $this->uriFactory = UriFactoryDiscovery::find();
        }

        return $this->uriFactory;
    }

-    public function setUriFactory(UriFactoryInterface $uriFactory): self
+    /**
+     * @param UriFactory $uriFactory
+     *
+     * @return HttpClientConfigurator
+     */
+    public function setUriFactory(UriFactory $uriFactory)
    {
        $this->uriFactory = $uriFactory;

        return $this;
    }

-    private function getHttpClient(): ClientInterface
+    /**
+     * @return HttpClient
+     */
+    private function getHttpClient()
    {
        if (null === $this->httpClient) {
-            $this->httpClient = Psr18ClientDiscovery::find();
+            $this->httpClient = HttpClientDiscovery::find();
        }

        return $this->httpClient;
    }

-    public function setHttpClient(ClientInterface $httpClient): self
+    /**
+     * @param HttpClient $httpClient
+     *
+     * @return HttpClientConfigurator
+     */
+    public function setHttpClient(HttpClient $httpClient)
    {
        $this->httpClient = $httpClient;

        return $this;
    }

-    public function getResponseHistory(): History
+    /**
+     * @return History
+     */
+    public function getResponseHistory()
    {
        return $this->responseHistory;
    }
--- a/src/Mailgun/Hydrator/ArrayHydrator.php
+++ b/src/Mailgun/Hydrator/ArrayHydrator.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -22,9 +20,12 @@ use Psr\Http\Message\ResponseInterface;
 final class ArrayHydrator implements Hydrator
 {
    /**
+     * @param ResponseInterface $response
+     * @param string            $class
+     *
     * @return array
     */
-    public function hydrate(ResponseInterface $response, string $class)
+    public function hydrate(ResponseInterface $response, $class)
    {
        $body = $response->getBody()->__toString();
        if (0 !== strpos($response->getHeaderLine('Content-Type'), 'application/json')) {
--- a/src/Mailgun/Hydrator/Hydrator.php
+++ b/src/Mailgun/Hydrator/Hydrator.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -20,7 +18,12 @@ use Psr\Http\Message\ResponseInterface;
 interface Hydrator
 {
    /**
+     * @param ResponseInterface $response
+     * @param string            $class
+     *
+     * @return mixed
+     *
     * @throws HydrationException
     */
-    public function hydrate(ResponseInterface $response, string $class);
+    public function hydrate(ResponseInterface $response, $class);
 }
--- a/src/Mailgun/Hydrator/ModelHydrator.php
+++ b/src/Mailgun/Hydrator/ModelHydrator.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -23,19 +21,20 @@ use Psr\Http\Message\ResponseInterface;
 final class ModelHydrator implements Hydrator
 {
    /**
+     * @param ResponseInterface $response
+     * @param string            $class
+     *
     * @return ResponseInterface
     */
-    public function hydrate(ResponseInterface $response, string $class)
+    public function hydrate(ResponseInterface $response, $class)
    {
        $body = $response->getBody()->__toString();
        $contentType = $response->getHeaderLine('Content-Type');
-
        if (0 !== strpos($contentType, 'application/json') && 0 !== strpos($contentType, 'application/octet-stream')) {
            throw new HydrationException('The ModelHydrator cannot hydrate response with Content-Type: '.$contentType);
        }

        $data = json_decode($body, true);
-
        if (JSON_ERROR_NONE !== json_last_error()) {
            throw new HydrationException(sprintf('Error (%d) when trying to json_decode response', json_last_error()));
        }
--- a/src/Mailgun/Hydrator/NoopHydrator.php
+++ b/src/Mailgun/Hydrator/NoopHydrator.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -21,9 +19,12 @@ use Psr\Http\Message\ResponseInterface;
 final class NoopHydrator implements Hydrator
 {
    /**
+     * @param ResponseInterface $response
+     * @param string            $class
+     *
     * @throws \LogicException
     */
-    public function hydrate(ResponseInterface $response, string $class)
+    public function hydrate(ResponseInterface $response, $class)
    {
        throw new \LogicException('The NoopHydrator should never be called');
    }
--- a/src/Mailgun/Lists/OptInHandler.php
+++ b/src/Mailgun/Lists/OptInHandler.php
@ -0,0 +1,60 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Lists;
+
+/**
+ * This class is used for creating a unique hash for
+ * mailing list subscription double-opt in requests.
+ *
+ * @see https://github.com/mailgun/mailgun-php/blob/master/src/Mailgun/Lists/README.md
+ */
+class OptInHandler
+{
+    /**
+     * @param string $mailingList
+     * @param string $secretAppId
+     * @param string $recipientAddress
+     *
+     * @return string
+     */
+    public function generateHash($mailingList, $secretAppId, $recipientAddress)
+    {
+        $innerPayload = ['r' => $recipientAddress, 'l' => $mailingList];
+        $encodedInnerPayload = base64_encode(json_encode($innerPayload));
+
+        $innerHash = hash_hmac('sha1', $encodedInnerPayload, $secretAppId);
+        $outerPayload = ['h' => $innerHash, 'p' => $encodedInnerPayload];
+
+        return urlencode(base64_encode(json_encode($outerPayload)));
+    }
+
+    /**
+     * @param string $secretAppId
+     * @param string $uniqueHash
+     *
+     * @return array|bool
+     */
+    public function validateHash($secretAppId, $uniqueHash)
+    {
+        $decodedOuterPayload = json_decode(base64_decode(urldecode($uniqueHash)), true);
+
+        $decodedHash = $decodedOuterPayload['h'];
+        $innerPayload = $decodedOuterPayload['p'];
+
+        $decodedInnerPayload = json_decode(base64_decode($innerPayload), true);
+        $computedInnerHash = hash_hmac('sha1', $innerPayload, $secretAppId);
+
+        if ($computedInnerHash == $decodedHash) {
+            return ['recipientAddress' => $decodedInnerPayload['r'], 'mailingList' => $decodedInnerPayload['l']];
+        }
+
+        return false;
+    }
+}
--- a/src/Mailgun/Lists/README.md
+++ b/src/Mailgun/Lists/README.md
@ -0,0 +1,116 @@
+Mailgun - Lists
+====================
+
+This is the Mailgun PHP *Lists* utilities. 
+
+The below assumes you've already installed the Mailgun PHP SDK in to your project. 
+If not, go back to the master README for instructions.
+
+There is currently one utility provided.
+
+OptInHandler: Provides methods for authenticating an OptInRequest. 
+
+The typical flow for using this utility would be as follows:  
+**Recipient Requests Subscribe** -> [Validate Recipient Address] -> [Generate Opt In Link] -> [Email Recipient Opt In Link]  
+**Recipient Clicks Opt In Link** -> [Validate Opt In Link] -> [Subscribe User] -> [Send final confirmation]  
+
+The above flow is modeled below.
+
+Usage - Opt-In Handler (Recipient Requests Subscribe)
+-----------------------------------------------------
+Here's how to use Opt-In Handler to validate Opt-In requests. 
+
+```php
+# First, instantiate the SDK with your API credentials, domain, and required parameters for example. 
+$mg = new Mailgun('key-example');
+$mgValidate = new Mailgun('pub-key-example');
+
+$domain = 'example.com';
+$mailingList = 'youlist@example.com';
+$secretPassphrase = 'a_secret_passphrase';
+$recipientAddress = 'recipient@example.com';
+
+# Let's validate the customer's email address, using Mailgun's validation endpoint.
+$result = $mgValidate->get('address/validate', array('address' => $recipientAddress));
+
+if($result->http_response_body->is_valid == true){
+	# Next, instantiate an OptInHandler object from the SDK.
+	$optInHandler = $mg->OptInHandler();
+	
+	# Next, generate a hash.
+	$generatedHash = $optInHandler->generateHash($mailingList, $secretPassphrase, $recipientAddress);
+	
+	# Now, let's send a confirmation to the recipient with our link.
+	$mg->sendMessage($domain, array('from'    => 'bob@example.com', 
+	                                'to'      => $recipientAddress, 
+	                                'subject' => 'Please Confirm!', 
+	                                'html'    => "<html><body>Hello,<br><br>You have requested to be subscribed 
+	                                			  to the mailing list $mailingList. Please <a 
+	                                			  href=\"http://yourdomain.com/subscribe.php?hash=$generatedHash\">
+	                                			  confirm</a> your subscription.<br><br>Thank you!</body></html>"));
+	                                			  
+	# Finally, let's add the subscriber to a Mailing List, as unsubscribed, so we can track non-conversions.
+	$mg->post("lists/$mailingList/members", array('address'    => $recipientAddress, 
+	                                		      'subscribed' => 'no',
+	                                			  'upsert'     => 'yes'));
+}
+```
+
+Usage - Opt-In Handler (Recipient Clicks Opt In Link)
+-----------------------------------------------------
+Here's how to use Opt-In Handler to validate an Opt-In Hash. 
+
+```php
+# First, instantiate the SDK with your API credentials and domain. 
+$mg = new Mailgun('key-example');
+$domain = 'example.com';
+
+# Next, instantiate an OptInHandler object from the SDK.
+$optInHandler = $mg->OptInHandler();
+
+# Next, grab the hash.
+$inboundHash = $_GET['hash'];
+$secretPassphrase = 'a_secret_passphrase';
+
+# Now, validate the captured hash.
+$hashValidation = $optInHandler->validateHash($secretPassphrase, $inboundHash);
+
+# Lastly, check to see if we have results, parse, subscribe, and send confirmation.
+if($hashValidation){
+	$validatedList = $hashValidation['mailingList'];
+	$validatedRecipient = $hashValidation['recipientAddress'];
+	
+	$mg->put("lists/$validatedList/members/$validatedRecipient", 
+						array('address'    => $validatedRecipient, 
+                              'subscribed' => 'yes'));
+    
+    $mg->sendMessage($domain, array('from'    => 'bob@example.com', 
+                                    'to'      => $validatedRecipient, 
+                                    'subject' => 'Confirmation Received!', 
+                                    'html'    => "<html><body>Hello,<br><br>We've successfully subscribed 
+                                	              you to the list, $validatedList!<br><br>Thank you!
+                                	              </body></html>"));
+}
+```
+
+A few notes:  
+1. 'a_secret_passphrase' can be anything. It's used as the *key* in hashing, 
+since your email address will vary.  
+2. validateHash() will return an array containing the recipient address and list 
+address.  
+3. You should *always* send an email confirmation before and after the 
+subscription request.  
+4. WARNING: On $_GET['hash'], you need to sanitize this value to prevent 
+malicious attempts to inject code.  
+
+Available Functions
+-----------------------------------------------------
+
+`string generateHash(string $mailingList, string $secretAppId, string $recipientAddress)` 
+
+`array validateHash(string $secretAppId, string $uniqueHash)`  
+
+More Documentation
+------------------
+See the official [Mailgun Docs](http://documentation.mailgun.com/api-sending.html) 
+for more information.
--- a/src/Mailgun/Mailgun.php
+++ b/src/Mailgun/Mailgun.php
@ -0,0 +1,381 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun;
+
+use Http\Client\Common\HttpMethodsClient;
+use Http\Client\HttpClient;
+use Mailgun\Connection\RestClient;
+use Mailgun\Constants\ExceptionMessages;
+use Mailgun\HttpClient\Plugin\History;
+use Mailgun\Lists\OptInHandler;
+use Mailgun\Messages\BatchMessage;
+use Mailgun\Messages\Exceptions;
+use Mailgun\Messages\MessageBuilder;
+use Mailgun\Hydrator\ModelHydrator;
+use Mailgun\Hydrator\Hydrator;
+use Psr\Http\Message\ResponseInterface;
+
+/**
+ * This class is the base class for the Mailgun SDK.
+ */
+class Mailgun
+{
+    /**
+     * @var RestClient
+     *
+     * @depracated Will be removed in 3.0
+     */
+    protected $restClient;
+
+    /**
+     * @var null|string
+     */
+    protected $apiKey;
+
+    /**
+     * @var HttpMethodsClient
+     */
+    private $httpClient;
+
+    /**
+     * @var Hydrator
+     */
+    private $hydrator;
+
+    /**
+     * @var RequestBuilder
+     */
+    private $requestBuilder;
+
+    /**
+     * This is a object that holds the last response from the API.
+     *
+     * @var History
+     */
+    private $responseHistory = null;
+
+    /**
+     * @param string|null         $apiKey
+     * @param HttpClient|null     $httpClient
+     * @param string              $apiEndpoint
+     * @param Hydrator|null       $hydrator
+     * @param RequestBuilder|null $requestBuilder
+     *
+     * @internal Use Mailgun::configure or Mailgun::create instead.
+     */
+    public function __construct(
+        $apiKey = null, /* Deprecated, will be removed in 3.0 */
+        HttpClient $httpClient = null,
+        $apiEndpoint = 'api.mailgun.net', /* Deprecated, will be removed in 3.0 */
+        Hydrator $hydrator = null,
+        RequestBuilder $requestBuilder = null
+    ) {
+        $this->apiKey = $apiKey;
+        $this->restClient = new RestClient($apiKey, $apiEndpoint, $httpClient);
+
+        $this->httpClient = $httpClient;
+        $this->requestBuilder = $requestBuilder ?: new RequestBuilder();
+        $this->hydrator = $hydrator ?: new ModelHydrator();
+    }
+
+    /**
+     * @param HttpClientConfigurator $configurator
+     * @param Hydrator|null          $hydrator
+     * @param RequestBuilder|null    $requestBuilder
+     *
+     * @return Mailgun
+     */
+    public static function configure(
+        HttpClientConfigurator $configurator,
+        Hydrator $hydrator = null,
+        RequestBuilder $requestBuilder = null
+    ) {
+        $httpClient = $configurator->createConfiguredClient();
+
+        return new self($configurator->getApiKey(), $httpClient, 'api.mailgun.net', $hydrator, $requestBuilder);
+    }
+
+    /**
+     * @param string $apiKey
+     *
+     * @return Mailgun
+     */
+    public static function create($apiKey)
+    {
+        $httpClientConfigurator = (new HttpClientConfigurator())->setApiKey($apiKey);
+
+        return self::configure($httpClientConfigurator);
+    }
+
+    /**
+     *  This function allows the sending of a fully formed message OR a custom
+     *  MIME string. If sending MIME, the string must be passed in to the 3rd
+     *  position of the function call.
+     *
+     * @param string $workingDomain
+     * @param array  $postData
+     * @param array  $postFiles
+     *
+     * @throws Exceptions\MissingRequiredMIMEParameters
+     *
+     * @return \stdClass
+     *
+     * @deprecated Use Mailgun->messages()->send() instead. Will be removed in 3.0
+     */
+    public function sendMessage($workingDomain, $postData, $postFiles = [])
+    {
+        if (is_array($postFiles)) {
+            return $this->post("$workingDomain/messages", $postData, $postFiles);
+        } elseif (is_string($postFiles)) {
+            $tempFile = tempnam(sys_get_temp_dir(), 'MG_TMP_MIME');
+            $fileHandle = fopen($tempFile, 'w');
+            fwrite($fileHandle, $postFiles);
+
+            $result = $this->post("$workingDomain/messages.mime", $postData, ['message' => $tempFile]);
+            fclose($fileHandle);
+            unlink($tempFile);
+
+            return $result;
+        } else {
+            throw new Exceptions\MissingRequiredMIMEParameters(ExceptionMessages::EXCEPTION_MISSING_REQUIRED_MIME_PARAMETERS);
+        }
+    }
+
+    /**
+     * This function checks the signature in a POST request to see if it is
+     * authentic.
+     *
+     * Pass an array of parameters.  If you pass nothing, $_POST will be
+     * used instead.
+     *
+     * If this function returns FALSE, you must not process the request.
+     * You should reject the request with status code 403 Forbidden.
+     *
+     * @param array|null $postData
+     *
+     * @return bool
+     *
+     * @deprecated Use Mailgun->webhook() instead. Will be removed in 3.0
+     */
+    public function verifyWebhookSignature($postData = null)
+    {
+        if (null === $postData) {
+            $postData = $_POST;
+        }
+        if (!isset($postData['timestamp']) || !isset($postData['token']) || !isset($postData['signature'])) {
+            return false;
+        }
+        $hmac = hash_hmac('sha256', "{$postData['timestamp']}{$postData['token']}", $this->apiKey);
+        $sig = $postData['signature'];
+        if (function_exists('hash_equals')) {
+            // hash_equals is constant time, but will not be introduced until PHP 5.6
+            return hash_equals($hmac, $sig);
+        } else {
+            return $hmac === $sig;
+        }
+    }
+
+    /**
+     * @return ResponseInterface|null
+     */
+    public function getLastResponse()
+    {
+        return $this->responseHistory->getLastResponse();
+    }
+
+    /**
+     * @param string $endpointUrl
+     * @param array  $postData
+     * @param array  $files
+     *
+     * @return \stdClass
+     *
+     * @deprecated Will be removed in 3.0
+     */
+    public function post($endpointUrl, $postData = [], $files = [])
+    {
+        return $this->restClient->post($endpointUrl, $postData, $files);
+    }
+
+    /**
+     * @param string $endpointUrl
+     * @param array  $queryString
+     *
+     * @return \stdClass
+     *
+     * @deprecated Will be removed in 3.0
+     */
+    public function get($endpointUrl, $queryString = [])
+    {
+        return $this->restClient->get($endpointUrl, $queryString);
+    }
+
+    /**
+     * @param string $url
+     *
+     * @return \stdClass
+     *
+     * @deprecated Will be removed in 3.0
+     */
+    public function getAttachment($url)
+    {
+        return $this->restClient->getAttachment($url);
+    }
+
+    /**
+     * @param string $endpointUrl
+     *
+     * @return \stdClass
+     *
+     * @deprecated Will be removed in 3.0
+     */
+    public function delete($endpointUrl)
+    {
+        return $this->restClient->delete($endpointUrl);
+    }
+
+    /**
+     * @param string $endpointUrl
+     * @param array  $putData
+     *
+     * @return \stdClass
+     *
+     * @deprecated Will be removed in 3.0
+     */
+    public function put($endpointUrl, $putData)
+    {
+        return $this->restClient->put($endpointUrl, $putData);
+    }
+
+    /**
+     * @param string $apiVersion
+     *
+     * @return Mailgun
+     *
+     * @deprecated Will be removed in 3.0
+     */
+    public function setApiVersion($apiVersion)
+    {
+        $this->restClient->setApiVersion($apiVersion);
+
+        return $this;
+    }
+
+    /**
+     * @param bool $sslEnabled
+     *
+     * @return Mailgun
+     *
+     * @deprecated This will be removed in 3.0. Mailgun does not support non-secure connections to their API.
+     */
+    public function setSslEnabled($sslEnabled)
+    {
+        $this->restClient->setSslEnabled($sslEnabled);
+
+        return $this;
+    }
+
+    /**
+     * @return MessageBuilder
+     *
+     * @deprecated Will be removed in 3.0.
+     */
+    public function MessageBuilder()
+    {
+        return new MessageBuilder();
+    }
+
+    /**
+     * @return OptInHandler
+     *
+     * @deprecated Will be removed in 3.0
+     */
+    public function OptInHandler()
+    {
+        return new OptInHandler();
+    }
+
+    /**
+     * @param string $workingDomain
+     * @param bool   $autoSend
+     *
+     * @return BatchMessage
+     *
+     * @deprecated Will be removed in 3.0. Use Mailgun::messages()::getBatchMessage().
+     */
+    public function BatchMessage($workingDomain, $autoSend = true)
+    {
+        return new BatchMessage($this->restClient, $workingDomain, $autoSend);
+    }
+
+    /**
+     * @return Api\Stats
+     */
+    public function stats()
+    {
+        return new Api\Stats($this->httpClient, $this->requestBuilder, $this->hydrator);
+    }
+
+    /**
+     * @return Api\Domain
+     */
+    public function domains()
+    {
+        return new Api\Domain($this->httpClient, $this->requestBuilder, $this->hydrator);
+    }
+
+    /**
+     * @return Api\Tag
+     */
+    public function tags()
+    {
+        return new Api\Tag($this->httpClient, $this->requestBuilder, $this->hydrator);
+    }
+
+    /**
+     * @return Api\Event
+     */
+    public function events()
+    {
+        return new Api\Event($this->httpClient, $this->requestBuilder, $this->hydrator);
+    }
+
+    /**
+     * @return Api\Route
+     */
+    public function routes()
+    {
+        return new Api\Route($this->httpClient, $this->requestBuilder, $this->hydrator);
+    }
+
+    /**
+     * @return Api\Webhook
+     */
+    public function webhooks()
+    {
+        return new Api\Webhook($this->httpClient, $this->requestBuilder, $this->hydrator, $this->apiKey);
+    }
+
+    /**
+     * @return Api\Message
+     */
+    public function messages()
+    {
+        return new Api\Message($this->httpClient, $this->requestBuilder, $this->hydrator);
+    }
+
+    /**
+     * @return Api\Suppression
+     */
+    public function suppressions()
+    {
+        return new Api\Suppression($this->httpClient, $this->requestBuilder, $this->hydrator);
+    }
+}
--- a/src/Mailgun/Message/BatchMessage.php
+++ b/src/Mailgun/Message/BatchMessage.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -32,7 +30,7 @@ class BatchMessage extends MessageBuilder
    /**
     * @var bool
     */
-    private $autoSend;
+    private $autoSend = true;

    /**
     * @var array
@ -49,7 +47,12 @@ class BatchMessage extends MessageBuilder
     */
    private $api;

-    public function __construct(Message $messageApi, string $domain, bool $autoSend)
+    /**
+     * @param Message $messageApi
+     * @param string  $domain
+     * @param bool    $autoSend
+     */
+    public function __construct(Message $messageApi, $domain, $autoSend)
    {
        $this->api = $messageApi;
        $this->domain = $domain;
@ -57,7 +60,9 @@ class BatchMessage extends MessageBuilder
    }

    /**
-     * @param array $variables {
+     * @param string $headerName
+     * @param string $address
+     * @param array  $variables  {
     *
     *     @var string $id
     *     @var string $full_name
@ -68,10 +73,10 @@ class BatchMessage extends MessageBuilder
     * @throws MissingRequiredParameter
     * @throws TooManyRecipients
     */
-    protected function addRecipient(string $headerName, string $address, array $variables): MessageBuilder
+    protected function addRecipient($headerName, $address, array $variables)
    {
        if (array_key_exists($headerName, $this->counters['recipients'])) {
-            if (self::RECIPIENT_COUNT_LIMIT === $this->counters['recipients'][$headerName]) {
+            if ($this->counters['recipients'][$headerName] === self::RECIPIENT_COUNT_LIMIT) {
                if (false === $this->autoSend) {
                    throw TooManyRecipients::whenAutoSendDisabled();
                }
@ -85,55 +90,44 @@ class BatchMessage extends MessageBuilder
            $variables['id'] = $headerName.'_'.$this->counters['recipients'][$headerName];
        }

-        $this->batchRecipientAttributes[$address] = $variables;
-
-        return $this;
+        $this->batchRecipientAttributes[(string) $address] = $variables;
    }

    /**
-     * @throws RuntimeException
     * @throws MissingRequiredParameter
     */
-    public function finalize(): void
+    public function finalize()
    {
        $message = $this->message;

        if (empty($this->domain)) {
            throw new RuntimeException('You must call BatchMessage::setDomain before sending messages.');
-        }
-
-        if (empty($message['from'])) {
+        } elseif (empty($message['from'])) {
            throw MissingRequiredParameter::create('from');
-        }
-
-        if (empty($message['to'])) {
+        } elseif (empty($message['to'])) {
            throw MissingRequiredParameter::create('to');
-        }
-
-        if (empty($message['subject'])) {
+        } elseif (empty($message['subject'])) {
            throw MissingRequiredParameter::create('subject');
-        }
-
-        if (empty($message['text']) && empty($message['html'])) {
+        } elseif (empty($message['text']) && empty($message['html'])) {
            throw MissingRequiredParameter::create('text" or "html');
+        } else {
+            $message['recipient-variables'] = json_encode($this->batchRecipientAttributes);
+            $response = $this->api->send($this->domain, $message);
+
+            $this->batchRecipientAttributes = [];
+            $this->counters['recipients']['to'] = 0;
+            $this->counters['recipients']['cc'] = 0;
+            $this->counters['recipients']['bcc'] = 0;
+            unset($this->message['to']);
+
+            $this->messageIds[] = $response->getId();
        }
-
-        $message['recipient-variables'] = json_encode($this->batchRecipientAttributes);
-        $response = $this->api->send($this->domain, $message);
-
-        $this->batchRecipientAttributes = [];
-        $this->counters['recipients']['to'] = 0;
-        $this->counters['recipients']['cc'] = 0;
-        $this->counters['recipients']['bcc'] = 0;
-        unset($this->message['to']);
-
-        $this->messageIds[] = $response->getId();
    }

    /**
     * @return string[]
     */
-    public function getMessageIds(): array
+    public function getMessageIds()
    {
        return $this->messageIds;
    }
--- a/src/Mailgun/Message/Exceptions/LimitExceeded.php
+++ b/src/Mailgun/Message/Exceptions/LimitExceeded.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -15,7 +13,7 @@ use Mailgun\Exception;

 class LimitExceeded extends \Exception implements Exception
 {
-    public static function create(string $field, int $limit)
+    public static function create($field, $limit)
    {
        return new self(sprintf('You\'ve exceeded the maximum (%d) %s for a single message.', $limit, $field));
    }
--- a/src/Mailgun/Message/Exceptions/MissingRequiredParameter.php
+++ b/src/Mailgun/Message/Exceptions/MissingRequiredParameter.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -15,7 +13,7 @@ use Mailgun\Exception;

 class MissingRequiredParameter extends \Exception implements Exception
 {
-    public static function create(string $parameter, string $message = null)
+    public static function create($parameter, $message = null)
    {
        if (null === $message) {
            $message = 'The parameters passed to the API were invalid. Please specify "%s".';
--- a/src/Mailgun/Message/Exceptions/RuntimeException.php
+++ b/src/Mailgun/Message/Exceptions/RuntimeException.php
--- a/src/Mailgun/Message/Exceptions/TooManyRecipients.php
+++ b/src/Mailgun/Message/Exceptions/TooManyRecipients.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -16,12 +14,12 @@ use Mailgun\Message\MessageBuilder;

 class TooManyRecipients extends LimitExceeded implements Exception
 {
-    public static function create(string $field, int $limit = MessageBuilder::RECIPIENT_COUNT_LIMIT)
+    public static function create($field, $limit = MessageBuilder::RECIPIENT_COUNT_LIMIT)
    {
        return new self(sprintf('You\'ve exceeded the maximum recipient count (%s) for filed "%s".', $limit, $field));
    }

-    public static function whenAutoSendDisabled(int $limit = MessageBuilder::RECIPIENT_COUNT_LIMIT)
+    public static function whenAutoSendDisabled($limit = MessageBuilder::RECIPIENT_COUNT_LIMIT)
    {
        return new self(sprintf('You\'ve exceeded the maximum recipient count (%s) with autosend disabled.', $limit));
    }
--- a/src/Mailgun/Message/MessageBuilder.php
+++ b/src/Mailgun/Message/MessageBuilder.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -57,7 +55,14 @@ class MessageBuilder
        ],
    ];

-    private function get(array $params, string $key, $default)
+    /**
+     * @param array  $params
+     * @param string $key
+     * @param mixed  $default
+     *
+     * @return mixed
+     */
+    private function get($params, $key, $default)
    {
        if (array_key_exists($key, $params)) {
            return $params[$key];
@ -73,8 +78,10 @@ class MessageBuilder
     *     @var string $first
     *     @var string $last
     * }
+     *
+     * @return string
     */
-    private function getFullName(array $params): string
+    private function getFullName(array $params)
    {
        if (isset($params['full_name'])) {
            return $this->get($params, 'full_name', '');
@ -84,12 +91,17 @@ class MessageBuilder
    }

    /**
-     *     @var string
+     * @param string $address
+     * @param array  $params  {
+     *
+     *     @var string $full_name
     *     @var string $first
     *     @var string $last
     * }
+     *
+     * @return string
     */
-    protected function parseAddress(string $address, array $variables): string
+    protected function parseAddress($address, array $variables)
    {
        $fullName = $this->getFullName($variables);
        if (!empty($fullName)) {
@ -100,14 +112,16 @@ class MessageBuilder
    }

    /**
-     * @param array $variables {
+     * @param string $headerName
+     * @param string $address
+     * @param array  $variables  {
     *
     *     @var string $full_name
     *     @var string $first
     *     @var string $last
     * }
     */
-    protected function addRecipient(string $headerName, string $address, array $variables): self
+    protected function addRecipient($headerName, $address, array $variables)
    {
        $compiledAddress = $this->parseAddress($address, $variables);

@ -119,14 +133,13 @@ class MessageBuilder
            $this->message[$headerName] = [$compiledAddress];
        }
        if (array_key_exists($headerName, $this->counters['recipients'])) {
-            ++$this->counters['recipients'][$headerName];
+            $this->counters['recipients'][$headerName] += 1;
        }
-
-        return $this;
    }

    /**
-     * @param array $variables {
+     * @param string $address
+     * @param array  $variables {
     *
     *     @var string $id If used with BatchMessage
     *     @var string $full_name
@ -136,18 +149,17 @@ class MessageBuilder
     *
     * @throws TooManyRecipients
     */
-    public function addToRecipient(string $address, array $variables = []): self
+    public function addToRecipient($address, array $variables = [])
    {
        if ($this->counters['recipients']['to'] > self::RECIPIENT_COUNT_LIMIT) {
            throw TooManyRecipients::create('to');
        }
        $this->addRecipient('to', $address, $variables);
-
-        return $this;
    }

    /**
-     * @param array $variables {
+     * @param string $address
+     * @param array  $variables {
     *
     *     @var string $id If used with BatchMessage
     *     @var string $full_name
@ -157,19 +169,18 @@ class MessageBuilder
     *
     * @throws TooManyRecipients
     */
-    public function addCcRecipient(string $address, array $variables = []): self
+    public function addCcRecipient($address, array $variables = [])
    {
        if ($this->counters['recipients']['cc'] > self::RECIPIENT_COUNT_LIMIT) {
            throw TooManyRecipients::create('cc');
        }

        $this->addRecipient('cc', $address, $variables);
-
-        return $this;
    }

    /**
-     * @param array $variables {
+     * @param string $address
+     * @param array  $variables {
     *
     *     @var string $id If used with BatchMessage
     *     @var string $full_name
@ -179,19 +190,18 @@ class MessageBuilder
     *
     * @throws TooManyRecipients
     */
-    public function addBccRecipient(string $address, array $variables = []): self
+    public function addBccRecipient($address, array $variables)
    {
        if ($this->counters['recipients']['bcc'] > self::RECIPIENT_COUNT_LIMIT) {
            throw TooManyRecipients::create('bcc');
        }

        $this->addRecipient('bcc', $address, $variables);
-
-        return $this;
    }

    /**
-     * @param array $variables {
+     * @param string $address
+     * @param array  $variables {
     *
     *     @var string $id If used with BatchMessage
     *     @var string $full_name
@ -199,15 +209,14 @@ class MessageBuilder
     *     @var string $last
     * }
     */
-    public function setFromAddress(string $address, array $variables = []): self
+    public function setFromAddress($address, array $variables = [])
    {
        $this->addRecipient('from', $address, $variables);
-
-        return $this;
    }

    /**
-     * @param array $variables {
+     * @param string $address
+     * @param array  $variables {
     *
     *     @var string $id If used with BatchMessage
     *     @var string $full_name
@ -215,21 +224,24 @@ class MessageBuilder
     *     @var string $last
     * }
     */
-    public function setReplyToAddress(string $address, array $variables = []): self
+    public function setReplyToAddress($address, array $variables = [])
    {
        $this->addRecipient('h:reply-to', $address, $variables);
-
-        return $this;
    }

-    public function setSubject(string $subject): self
+    /**
+     * @param string $subject
+     */
+    public function setSubject($subject)
    {
        $this->message['subject'] = $subject;
-
-        return $this;
    }

-    public function addCustomHeader(string $headerName, $headerData): self
+    /**
+     * @param string $headerName
+     * @param mixed  $headerData
+     */
+    public function addCustomHeader($headerName, $headerData)
    {
        if (!preg_match('/^h:/i', $headerName)) {
            $headerName = 'h:'.$headerName;
@ -244,25 +256,31 @@ class MessageBuilder
                $this->message[$headerName] = [$this->message[$headerName], $headerData];
            }
        }
-
-        return $this;
    }

-    public function setTextBody(string $textBody): self
+    /**
+     * @param string $textBody
+     */
+    public function setTextBody($textBody)
    {
        $this->message['text'] = $textBody;
-
-        return $this;
    }

-    public function setHtmlBody(string $htmlBody): self
+    /**
+     * @param string $htmlBody
+     *
+     * @return string
+     */
+    public function setHtmlBody($htmlBody)
    {
        $this->message['html'] = $htmlBody;
-
-        return $this;
    }

-    public function addAttachment(string $attachmentPath, string $attachmentName = null): self
+    /**
+     * @param string      $attachmentPath
+     * @param string|null $attachmentName
+     */
+    public function addAttachment($attachmentPath, $attachmentName = null)
    {
        if (!isset($this->message['attachment'])) {
            $this->message['attachment'] = [];
@ -270,13 +288,15 @@ class MessageBuilder

        $this->message['attachment'][] = [
            'filePath' => $attachmentPath,
-            'filename' => $attachmentName,
+            'remoteName' => $attachmentName,
        ];
-
-        return $this;
    }

-    public function addInlineImage(string $inlineImagePath, string $inlineImageName = null): self
+    /**
+     * @param string      $inlineImagePath
+     * @param string|null $inlineImageName
+     */
+    public function addInlineImage($inlineImagePath, $inlineImageName = null)
    {
        if (!isset($this->message['inline'])) {
            $this->message['inline'] = [];
@ -284,41 +304,42 @@ class MessageBuilder

        $this->message['inline'][] = [
            'filePath' => $inlineImagePath,
-            'filename' => $inlineImageName,
+            'remoteName' => $inlineImageName,
        ];
-
-        return $this;
-    }
-
-    public function setTestMode(bool $enabled): self
-    {
-        $this->message['o:testmode'] = $enabled ? 'yes' : 'no';
-
-        return $this;
    }

    /**
+     * @param bool $enabled
+     */
+    public function setTestMode($enabled)
+    {
+        $this->message['o:testmode'] = $this->boolToString($enabled);
+    }
+
+    /**
+     * @param string $campaignId
+     *
     * @throws LimitExceeded
     */
-    public function addCampaignId(string $campaignId): self
+    public function addCampaignId($campaignId)
    {
        if ($this->counters['attributes']['campaign_id'] >= self::CAMPAIGN_ID_LIMIT) {
            throw LimitExceeded::create('campaigns', self::CAMPAIGN_ID_LIMIT);
        }
        if (isset($this->message['o:campaign'])) {
-            array_push($this->message['o:campaign'], $campaignId);
+            array_push($this->message['o:campaign'], (string) $campaignId);
        } else {
-            $this->message['o:campaign'] = [$campaignId];
+            $this->message['o:campaign'] = [(string) $campaignId];
        }
-        ++$this->counters['attributes']['campaign_id'];
-
-        return $this;
+        $this->counters['attributes']['campaign_id'] += 1;
    }

    /**
+     * @param string $tag
+     *
     * @throws LimitExceeded
     */
-    public function addTag(string $tag): self
+    public function addTag($tag)
    {
        if ($this->counters['attributes']['tag'] >= self::TAG_LIMIT) {
            throw LimitExceeded::create('tags', self::TAG_LIMIT);
@ -329,41 +350,44 @@ class MessageBuilder
        } else {
            $this->message['o:tag'] = [$tag];
        }
-        ++$this->counters['attributes']['tag'];
-
-        return $this;
+        $this->counters['attributes']['tag'] += 1;
    }

-    public function setDkim(bool $enabled): self
+    /**
+     * @param bool $enabled
+     */
+    public function setDkim($enabled)
    {
-        $this->message['o:dkim'] = $enabled ? 'yes' : 'no';
-
-        return $this;
+        $this->message['o:dkim'] = $this->boolToString($enabled);
    }

-    public function setOpenTracking(bool $enabled): self
+    /**
+     * @param bool $enabled
+     *
+     * @return string
+     */
+    public function setOpenTracking($enabled)
    {
-        $this->message['o:tracking-opens'] = $enabled ? 'yes' : 'no';
-
-        return $this;
+        $this->message['o:tracking-opens'] = $this->boolToString($enabled);
    }

-    public function setClickTracking(bool $enabled, bool $htmlOnly = false): self
+    /**
+     * @param bool $enabled
+     *
+     * @return string
+     */
+    public function setClickTracking($enabled)
    {
-        $value = 'no';
-        if ($enabled) {
-            $value = 'yes';
-            if ($htmlOnly) {
-                $value = 'htmlonly';
-            }
-        }
-
-        $this->message['o:tracking-clicks'] = $value;
-
-        return $this;
+        $this->message['o:tracking-clicks'] = $this->boolToString($enabled);
    }

-    public function setDeliveryTime(string $timeDate, string $timeZone = null): self
+    /**
+     * @param string      $timeDate
+     * @param string|null $timeZone
+     *
+     * @return string
+     */
+    public function setDeliveryTime($timeDate, $timeZone = null)
    {
        if (null !== $timeZone) {
            $timeZoneObj = new \DateTimeZone($timeZone);
@ -375,17 +399,25 @@ class MessageBuilder
        $formattedTimeDate = $dateTimeObj->format(\DateTime::RFC2822);
        $this->message['o:deliverytime'] = $formattedTimeDate;

-        return $this;
+        return $this->message['o:deliverytime'];
    }

-    public function addCustomData(string $customName, $data): self
+    /**
+     * @param string $customName
+     * @param mixed  $data
+     */
+    public function addCustomData($customName, $data)
    {
        $this->message['v:'.$customName] = json_encode($data);
-
-        return $this;
    }

-    public function addCustomParameter(string $parameterName, $data): self
+    /**
+     * @param string $parameterName
+     * @param mixed  $data
+     *
+     * @return mixed
+     */
+    public function addCustomParameter($parameterName, $data)
    {
        if (isset($this->message[$parameterName])) {
            $this->message[$parameterName][] = $data;
@ -393,18 +425,40 @@ class MessageBuilder
            $this->message[$parameterName] = [$data];
        }

-        return $this;
+        return $this->message[$parameterName];
    }

-    public function setMessage(array $message): self
+    /**
+     * @param array $message
+     */
+    public function setMessage($message)
    {
        $this->message = $message;
-
-        return $this;
    }

-    public function getMessage(): array
+    /**
+     * @return array
+     */
+    public function getMessage()
    {
        return $this->message;
    }
+
+    /**
+     * @param $enabled
+     *
+     * @return string
+     */
+    private function boolToString($enabled)
+    {
+        if (filter_var($enabled, FILTER_VALIDATE_BOOLEAN)) {
+            $enabled = 'yes';
+        } elseif ('html' === $enabled) {
+            $enabled = 'html';
+        } else {
+            $enabled = 'no';
+        }
+
+        return $enabled;
+    }
 }
--- a/src/Mailgun/Message/README.md
+++ b/src/Mailgun/Message/README.md
--- a/src/Mailgun/Messages/BatchMessage.php
+++ b/src/Mailgun/Messages/BatchMessage.php
@ -0,0 +1,155 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Messages;
+
+use Mailgun\Constants\Api;
+use Mailgun\Constants\ExceptionMessages;
+use Mailgun\Messages\Exceptions\MissingRequiredMIMEParameters;
+use Mailgun\Messages\Exceptions\TooManyParameters;
+
+/**
+ * This class is used for batch sending. See the official documentation (link below)
+ * for usage instructions.
+ *
+ * @deprecated Will be removed in 3.0. Use Mailgun\Message\BatchMessage
+ * @see https://github.com/mailgun/mailgun-php/blob/master/src/Mailgun/Messages/README.md
+ */
+class BatchMessage extends MessageBuilder
+{
+    /**
+     * @var array
+     */
+    private $batchRecipientAttributes;
+
+    /**
+     * @var bool
+     */
+    private $autoSend;
+
+    /**
+     * @var \Mailgun\Connection\RestClient
+     */
+    private $restClient;
+
+    /**
+     * @var string
+     */
+    private $workingDomain;
+
+    /**
+     * @var array
+     */
+    private $messageIds = [];
+
+    /**
+     * @var string
+     */
+    private $endpointUrl;
+
+    /**
+     * @param \Mailgun\Connection\RestClient $restClient
+     * @param string                         $workingDomain
+     * @param bool                           $autoSend
+     */
+    public function __construct($restClient, $workingDomain, $autoSend)
+    {
+        $this->batchRecipientAttributes = [];
+        $this->autoSend = $autoSend;
+        $this->restClient = $restClient;
+        $this->workingDomain = $workingDomain;
+        $this->endpointUrl = $workingDomain.'/messages';
+    }
+
+    /**
+     * @param string $headerName
+     * @param string $address
+     * @param array  $variables
+     *
+     * @throws MissingRequiredMIMEParameters
+     * @throws TooManyParameters
+     */
+    protected function addRecipient($headerName, $address, $variables)
+    {
+        if (array_key_exists($headerName, $this->counters['recipients'])) {
+            if ($this->counters['recipients'][$headerName] == Api::RECIPIENT_COUNT_LIMIT) {
+                if (false === $this->autoSend) {
+                    throw new TooManyParameters(ExceptionMessages::TOO_MANY_RECIPIENTS);
+                }
+                $this->sendMessage();
+            }
+        }
+
+        $compiledAddress = $this->parseAddress($address, $variables);
+
+        if (isset($this->message[$headerName])) {
+            array_push($this->message[$headerName], $compiledAddress);
+        } elseif ('h:reply-to' == $headerName) {
+            $this->message[$headerName] = $compiledAddress;
+        } else {
+            $this->message[$headerName] = [$compiledAddress];
+        }
+
+        if (array_key_exists($headerName, $this->counters['recipients'])) {
+            $this->counters['recipients'][$headerName] += 1;
+            if (is_array($variables) && !array_key_exists('id', $variables)) {
+                $variables['id'] = $this->counters['recipients'][$headerName];
+            }
+        }
+        $this->batchRecipientAttributes["$address"] = $variables;
+    }
+
+    /**
+     * @param array $message
+     * @param array $files
+     *
+     * @throws MissingRequiredMIMEParameters
+     */
+    public function sendMessage($message = [], $files = [])
+    {
+        if (count($message) < 1) {
+            $message = $this->message;
+            $files = $this->files;
+        }
+        if (!array_key_exists('from', $message)) {
+            throw new MissingRequiredMIMEParameters(ExceptionMessages::EXCEPTION_MISSING_REQUIRED_MIME_PARAMETERS);
+        } elseif (!array_key_exists('to', $message)) {
+            throw new MissingRequiredMIMEParameters(ExceptionMessages::EXCEPTION_MISSING_REQUIRED_MIME_PARAMETERS);
+        } elseif (!array_key_exists('subject', $message)) {
+            throw new MissingRequiredMIMEParameters(ExceptionMessages::EXCEPTION_MISSING_REQUIRED_MIME_PARAMETERS);
+        } elseif ((!array_key_exists('text', $message) && !array_key_exists('html', $message))) {
+            throw new MissingRequiredMIMEParameters(ExceptionMessages::EXCEPTION_MISSING_REQUIRED_MIME_PARAMETERS);
+        } else {
+            $message['recipient-variables'] = json_encode($this->batchRecipientAttributes);
+            $response = $this->restClient->post($this->endpointUrl, $message, $files);
+            $this->batchRecipientAttributes = [];
+            $this->counters['recipients']['to'] = 0;
+            $this->counters['recipients']['cc'] = 0;
+            $this->counters['recipients']['bcc'] = 0;
+            unset($this->message['to']);
+            array_push($this->messageIds, $response->http_response_body->id);
+        }
+    }
+
+    /**
+     * @throws MissingRequiredMIMEParameters
+     */
+    public function finalize()
+    {
+        $this->sendMessage();
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getMessageIds()
+    {
+        return $this->messageIds;
+    }
+}
--- a/src/Mailgun/Messages/Exceptions/InvalidParameter.php
+++ b/src/Mailgun/Messages/Exceptions/InvalidParameter.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -9,10 +7,10 @@ declare(strict_types=1);
 * of the MIT license. See the LICENSE file for details.
 */

-namespace Mailgun\Tests\Model;
+namespace Mailgun\Messages\Exceptions;

-use PHPUnit\Framework\TestCase;
+use Mailgun\Exception;

-abstract class BaseModelTest extends TestCase
+class InvalidParameter extends \Exception implements Exception
 {
 }
--- a/src/Mailgun/Messages/Exceptions/InvalidParameterType.php
+++ b/src/Mailgun/Messages/Exceptions/InvalidParameterType.php
@ -0,0 +1,16 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Messages\Exceptions;
+
+use Mailgun\Exception;
+
+class InvalidParameterType extends \Exception implements Exception
+{
+}
--- a/src/Mailgun/Messages/Exceptions/MissingRequiredMIMEParameters.php
+++ b/src/Mailgun/Messages/Exceptions/MissingRequiredMIMEParameters.php
@ -0,0 +1,16 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Messages\Exceptions;
+
+use Mailgun\Exception;
+
+class MissingRequiredMIMEParameters extends \Exception implements Exception
+{
+}
--- a/src/Mailgun/Messages/Exceptions/TooManyParameters.php
+++ b/src/Mailgun/Messages/Exceptions/TooManyParameters.php
@ -0,0 +1,16 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Messages\Exceptions;
+
+use Mailgun\Exception;
+
+class TooManyParameters extends \Exception implements Exception
+{
+}
--- a/src/Mailgun/Messages/MessageBuilder.php
+++ b/src/Mailgun/Messages/MessageBuilder.php
@ -0,0 +1,530 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Messages;
+
+use Mailgun\Constants\Api;
+use Mailgun\Constants\ExceptionMessages;
+use Mailgun\Messages\Exceptions\InvalidParameter;
+use Mailgun\Messages\Exceptions\TooManyParameters;
+
+/**
+ * This class is used for composing a properly formed
+ * message object. Dealing with arrays can be cumbersome,
+ * this class makes the process easier. See the official
+ * documentation (link below) for usage instructions.
+ *
+ * @deprecated Will be removed in 3.0. Use Mailgun\Message\MessageBuilder
+ * @see https://github.com/mailgun/mailgun-php/blob/master/src/Mailgun/Messages/README.md
+ */
+class MessageBuilder
+{
+    /**
+     * @var array
+     */
+    protected $message = [];
+
+    /**
+     * @var array
+     */
+    protected $variables = [];
+
+    /**
+     * @var array
+     */
+    protected $files = [];
+
+    /**
+     * @var array
+     */
+    protected $counters = [
+        'recipients' => [
+            'to' => 0,
+            'cc' => 0,
+            'bcc' => 0,
+        ],
+        'attributes' => [
+            'attachment' => 0,
+            'campaign_id' => 0,
+            'custom_option' => 0,
+            'tag' => 0,
+        ],
+    ];
+
+    /**
+     * @param array  $params
+     * @param string $key
+     * @param mixed  $default
+     *
+     * @return mixed
+     */
+    protected function safeGet($params, $key, $default)
+    {
+        if (array_key_exists($key, $params)) {
+            return $params[$key];
+        }
+
+        return $default;
+    }
+
+    /**
+     * @param array $params
+     *
+     * @return mixed|string
+     */
+    protected function getFullName($params)
+    {
+        if (array_key_exists('first', $params)) {
+            $first = $this->safeGet($params, 'first', '');
+            $last = $this->safeGet($params, 'last', '');
+
+            return trim("$first $last");
+        }
+
+        return $this->safeGet($params, 'full_name', '');
+    }
+
+    /**
+     * @param string $address
+     * @param array  $variables
+     *
+     * @return string
+     */
+    protected function parseAddress($address, $variables)
+    {
+        if (!is_array($variables)) {
+            return $address;
+        }
+        $fullName = $this->getFullName($variables);
+        if (null != $fullName) {
+            return sprintf('"%s" <%s>', $fullName, $address);
+        }
+
+        return $address;
+    }
+
+    /**
+     * @param string $headerName
+     * @param string $address
+     * @param array  $variables
+     */
+    protected function addRecipient($headerName, $address, $variables)
+    {
+        $compiledAddress = $this->parseAddress($address, $variables);
+
+        if ('h:reply-to' === $headerName) {
+            $this->message[$headerName] = $compiledAddress;
+        } elseif (isset($this->message[$headerName])) {
+            array_push($this->message[$headerName], $compiledAddress);
+        } else {
+            $this->message[$headerName] = [$compiledAddress];
+        }
+        if (array_key_exists($headerName, $this->counters['recipients'])) {
+            $this->counters['recipients'][$headerName] += 1;
+        }
+    }
+
+    /**
+     * @param string     $address
+     * @param array|null $variables
+     *
+     * @throws TooManyParameters
+     *
+     * @return mixed
+     */
+    public function addToRecipient($address, $variables = null)
+    {
+        if ($this->counters['recipients']['to'] > Api::RECIPIENT_COUNT_LIMIT) {
+            throw new TooManyParameters(ExceptionMessages::TOO_MANY_PARAMETERS_RECIPIENT);
+        }
+
+        $variables = is_array($variables) ? $variables : [];
+
+        $this->addRecipient('to', $address, $variables);
+
+        return end($this->message['to']);
+    }
+
+    /**
+     * @param string     $address
+     * @param array|null $variables
+     *
+     * @throws TooManyParameters
+     *
+     * @return mixed
+     */
+    public function addCcRecipient($address, $variables = null)
+    {
+        if ($this->counters['recipients']['cc'] > Api::RECIPIENT_COUNT_LIMIT) {
+            throw new TooManyParameters(ExceptionMessages::TOO_MANY_PARAMETERS_RECIPIENT);
+        }
+
+        $variables = is_array($variables) ? $variables : [];
+
+        $this->addRecipient('cc', $address, $variables);
+
+        return end($this->message['cc']);
+    }
+
+    /**
+     * @param string     $address
+     * @param array|null $variables
+     *
+     * @throws TooManyParameters
+     *
+     * @return mixed
+     */
+    public function addBccRecipient($address, $variables = null)
+    {
+        if ($this->counters['recipients']['bcc'] > Api::RECIPIENT_COUNT_LIMIT) {
+            throw new TooManyParameters(ExceptionMessages::TOO_MANY_PARAMETERS_RECIPIENT);
+        }
+
+        $variables = is_array($variables) ? $variables : [];
+
+        $this->addRecipient('bcc', $address, $variables);
+
+        return end($this->message['bcc']);
+    }
+
+    /**
+     * @param string     $address
+     * @param array|null $variables
+     *
+     * @return mixed
+     */
+    public function setFromAddress($address, $variables = null)
+    {
+        $variables = is_array($variables) ? $variables : [];
+
+        $this->addRecipient('from', $address, $variables);
+
+        return $this->message['from'];
+    }
+
+    /**
+     * @param string     $address
+     * @param array|null $variables
+     *
+     * @return mixed
+     */
+    public function setReplyToAddress($address, $variables = null)
+    {
+        $variables = is_array($variables) ? $variables : [];
+
+        $this->addRecipient('h:reply-to', $address, $variables);
+
+        return $this->message['h:reply-to'];
+    }
+
+    /**
+     * @param string $subject
+     *
+     * @return mixed
+     */
+    public function setSubject($subject = '')
+    {
+        if (null == $subject || '' == $subject) {
+            $subject = ' ';
+        }
+        $this->message['subject'] = $subject;
+
+        return $this->message['subject'];
+    }
+
+    /**
+     * @param string $headerName
+     * @param mixed  $headerData
+     *
+     * @return mixed
+     */
+    public function addCustomHeader($headerName, $headerData)
+    {
+        if (!preg_match('/^h:/i', $headerName)) {
+            $headerName = 'h:'.$headerName;
+        }
+
+        if (array_key_exists($headerName, $this->message)) {
+            if (is_array($this->message[$headerName])) {
+                $this->message[$headerName][] = $headerData;
+            } else {
+                $this->message[$headerName] = [$this->message[$headerName], $headerData];
+            }
+        } else {
+            $this->message[$headerName] = $headerData;
+        }
+
+        return $this->message[$headerName];
+    }
+
+    /**
+     * @param string $textBody
+     *
+     * @return string
+     */
+    public function setTextBody($textBody)
+    {
+        if (null == $textBody || '' == $textBody) {
+            $textBody = ' ';
+        }
+        $this->message['text'] = $textBody;
+
+        return $this->message['text'];
+    }
+
+    /**
+     * @param string $htmlBody
+     *
+     * @return string
+     */
+    public function setHtmlBody($htmlBody)
+    {
+        if (null == $htmlBody || '' == $htmlBody) {
+            $htmlBody = ' ';
+        }
+        $this->message['html'] = $htmlBody;
+
+        return $this->message['html'];
+    }
+
+    /**
+     * @param string      $attachmentPath
+     * @param string|null $attachmentName
+     *
+     * @return bool
+     */
+    public function addAttachment($attachmentPath, $attachmentName = null)
+    {
+        if (isset($this->files['attachment'])) {
+            $attachment = [
+                'filePath' => $attachmentPath,
+                'remoteName' => $attachmentName,
+            ];
+            array_push($this->files['attachment'], $attachment);
+        } else {
+            $this->files['attachment'] = [
+                [
+                    'filePath' => $attachmentPath,
+                    'remoteName' => $attachmentName,
+                ],
+            ];
+        }
+
+        return true;
+    }
+
+    /**
+     * @param string      $inlineImagePath
+     * @param string|null $inlineImageName
+     *
+     * @throws InvalidParameter
+     *
+     * @return bool
+     */
+    public function addInlineImage($inlineImagePath, $inlineImageName = null)
+    {
+        if (0 !== strpos($inlineImagePath, '@')) {
+            throw new InvalidParameter(ExceptionMessages::INVALID_PARAMETER_INLINE);
+        }
+
+        $this->files['inline'][] = [
+            'filePath' => $inlineImagePath,
+            'remoteName' => $inlineImageName,
+        ];
+
+        return true;
+    }
+
+    /**
+     * @param bool $testMode
+     *
+     * @return string
+     */
+    public function setTestMode($testMode)
+    {
+        if (filter_var($testMode, FILTER_VALIDATE_BOOLEAN)) {
+            $testMode = 'yes';
+        } else {
+            $testMode = 'no';
+        }
+        $this->message['o:testmode'] = $testMode;
+
+        return $this->message['o:testmode'];
+    }
+
+    /**
+     * @param string|int $campaignId
+     *
+     * @throws TooManyParameters
+     *
+     * @return string|int
+     */
+    public function addCampaignId($campaignId)
+    {
+        if ($this->counters['attributes']['campaign_id'] < Api::CAMPAIGN_ID_LIMIT) {
+            if (isset($this->message['o:campaign'])) {
+                array_push($this->message['o:campaign'], (string) $campaignId);
+            } else {
+                $this->message['o:campaign'] = [(string) $campaignId];
+            }
+            $this->counters['attributes']['campaign_id'] += 1;
+
+            return $this->message['o:campaign'];
+        } else {
+            throw new TooManyParameters(ExceptionMessages::TOO_MANY_PARAMETERS_CAMPAIGNS);
+        }
+    }
+
+    /**
+     * @param string $tag
+     *
+     * @throws TooManyParameters
+     */
+    public function addTag($tag)
+    {
+        if ($this->counters['attributes']['tag'] < Api::TAG_LIMIT) {
+            if (isset($this->message['o:tag'])) {
+                array_push($this->message['o:tag'], $tag);
+            } else {
+                $this->message['o:tag'] = [$tag];
+            }
+            $this->counters['attributes']['tag'] += 1;
+
+            return $this->message['o:tag'];
+        } else {
+            throw new TooManyParameters(ExceptionMessages::TOO_MANY_PARAMETERS_TAGS);
+        }
+    }
+
+    /**
+     * @param bool $enabled
+     *
+     * @return mixed
+     */
+    public function setDkim($enabled)
+    {
+        if (filter_var($enabled, FILTER_VALIDATE_BOOLEAN)) {
+            $enabled = 'yes';
+        } else {
+            $enabled = 'no';
+        }
+        $this->message['o:dkim'] = $enabled;
+
+        return $this->message['o:dkim'];
+    }
+
+    /**
+     * @param bool $enabled
+     *
+     * @return string
+     */
+    public function setOpenTracking($enabled)
+    {
+        if (filter_var($enabled, FILTER_VALIDATE_BOOLEAN)) {
+            $enabled = 'yes';
+        } else {
+            $enabled = 'no';
+        }
+        $this->message['o:tracking-opens'] = $enabled;
+
+        return $this->message['o:tracking-opens'];
+    }
+
+    /**
+     * @param bool $enabled
+     *
+     * @return string
+     */
+    public function setClickTracking($enabled)
+    {
+        if (filter_var($enabled, FILTER_VALIDATE_BOOLEAN)) {
+            $enabled = 'yes';
+        } elseif ('html' == $enabled) {
+            $enabled = 'html';
+        } else {
+            $enabled = 'no';
+        }
+        $this->message['o:tracking-clicks'] = $enabled;
+
+        return $this->message['o:tracking-clicks'];
+    }
+
+    /**
+     * @param string      $timeDate
+     * @param string|null $timeZone
+     *
+     * @return string
+     */
+    public function setDeliveryTime($timeDate, $timeZone = null)
+    {
+        if (isset($timeZone)) {
+            $timeZoneObj = new \DateTimeZone("$timeZone");
+        } else {
+            $timeZoneObj = new \DateTimeZone(Api::DEFAULT_TIME_ZONE);
+        }
+
+        $dateTimeObj = new \DateTime($timeDate, $timeZoneObj);
+        $formattedTimeDate = $dateTimeObj->format(\DateTime::RFC2822);
+        $this->message['o:deliverytime'] = $formattedTimeDate;
+
+        return $this->message['o:deliverytime'];
+    }
+
+    /**
+     * @param string $customName
+     * @param mixed  $data
+     */
+    public function addCustomData($customName, $data)
+    {
+        $this->message['v:'.$customName] = json_encode($data);
+    }
+
+    /**
+     * @param string $parameterName
+     * @param mixed  $data
+     *
+     * @return mixed
+     */
+    public function addCustomParameter($parameterName, $data)
+    {
+        if (isset($this->message[$parameterName])) {
+            array_push($this->message[$parameterName], $data);
+
+            return $this->message[$parameterName];
+        } else {
+            $this->message[$parameterName] = [$data];
+
+            return $this->message[$parameterName];
+        }
+    }
+
+    /**
+     * @param array $message
+     */
+    public function setMessage($message)
+    {
+        $this->message = $message;
+    }
+
+    /**
+     * @return array
+     */
+    public function getMessage()
+    {
+        return $this->message;
+    }
+
+    /**
+     * @return array
+     */
+    public function getFiles()
+    {
+        return $this->files;
+    }
+}
--- a/src/Mailgun/Messages/README.md
+++ b/src/Mailgun/Messages/README.md
@ -0,0 +1,136 @@
+Mailgun - Messages
+====================
+
+This is the Mailgun PHP *Message* utilities. 
+
+The below assumes you've already installed the Mailgun PHP SDK in to your 
+project. If not, go back to the master README for instructions.
+
+There are two utilities included, Message Builder and Batch Message. 
+
+Message Builder: Allows you to build a message object by calling methods for 
+each MIME attribute. 
+Batch Message: Inherits Message Builder and allows you to iterate through 
+recipients from a list. Messages will fire after the 1,000th recipient has been 
+added. 
+
+Usage - Message Builder
+-----------------------
+Here's how to use Message Builder to build your Message. 
+
+```php
+# First, instantiate the SDK with your API credentials and define your domain. 
+$mg = new Mailgun("key-example");
+$domain = "example.com";
+
+# Next, instantiate a Message Builder object from the SDK.
+$messageBldr = $mg->MessageBuilder();
+
+# Define the from address.
+$messageBldr->setFromAddress("me@example.com", array("first"=>"PHP", "last" => "SDK"));
+# Define a to recipient.
+$messageBldr->addToRecipient("john.doe@example.com", array("first" => "John", "last" => "Doe"));
+# Define a cc recipient.
+$messageBldr->addCcRecipient("sally.doe@example.com", array("first" => "Sally", "last" => "Doe"));
+# Define the subject. 
+$messageBldr->setSubject("A message from the PHP SDK using Message Builder!");
+# Define the body of the message.
+$messageBldr->setTextBody("This is the text body of the message!");
+
+# Other Optional Parameters.
+$messageBldr->addCampaignId("My-Awesome-Campaign");
+$messageBldr->addCustomHeader("Customer-Id", "12345");
+$messageBldr->addAttachment("@/tron.jpg");
+$messageBldr->setDeliveryTime("tomorrow 8:00AM", "PST");
+$messageBldr->setClickTracking(true);
+
+# Finally, send the message.
+$mg->post("{$domain}/messages", $messageBldr->getMessage(), $messageBldr->getFiles());
+```
+
+Available Functions
+-----------------------------------------------------
+
+`string addToRecipient(string $address, array $attributes)` 
+
+`string addCcRecipient(string $address, array $attributes)`  
+
+`string addBccRecipient(string $address, array $attributes)`  
+
+`string setFromAddress(string $address, array $attributes)`  
+
+`string setSubject(string $subject)`  
+
+`string setTextBody(string $textBody)`  
+
+`string setHtmlBody(string $htmlBody)`  
+
+`bool addAttachment(string $attachmentPath, $attachmentName = null)`  
+
+`bool addInlineImage(string $inlineImagePath)`  
+
+`string setTestMode(bool $testMode)`  
+
+`string addCampaignId(string $campaignId)`  
+
+`string setDkim(bool $enabled)`  
+
+`string setOpenTracking($enabled)`  
+
+`string setClickTracking($enabled)`  
+
+`string setDeliveryTime(string $timeDate, string $timeZone)`  
+
+`string addCustomData(string $optionName, string $data)`  
+
+`string addCustomParameter(string $parameterName, string $data)`
+
+`array getMessage()`  
+
+`array getFiles()`  
+
+
+Usage - Batch Message
+---------------------
+Here's how to use Batch Message to easily handle batch sending jobs. 
+
+```php
+# First, instantiate the SDK with your API credentials and define your domain. 
+$mg = new Mailgun("key-example");
+$domain = "example.com";
+
+# Next, instantiate a Message Builder object from the SDK, pass in your sending domain.
+$batchMsg = $mg->BatchMessage($domain);
+
+# Define the from address.
+$batchMsg->setFromAddress("me@example.com", array("first"=>"PHP", "last" => "SDK"));
+# Define the subject. 
+$batchMsg->setSubject("A Batch Message from the PHP SDK!");
+# Define the body of the message.
+$batchMsg->setTextBody("This is the text body of the message!");
+
+# Next, let's add a few recipients to the batch job.
+$batchMsg->addToRecipient("john.doe@example.com", array("first" => "John", "last" => "Doe"));
+$batchMsg->addToRecipient("sally.doe@example.com", array("first" => "Sally", "last" => "Doe"));
+$batchMsg->addToRecipient("mike.jones@example.com", array("first" => "Mike", "last" => "Jones"));
+...
+// After 1,000 recipients, Batch Message will automatically post your message to the messages endpoint. 
+
+// Call finalize() to send any remaining recipients still in the buffer.
+$batchMsg->finalize();
+
+```
+
+Available Functions (Inherits all Batch Message and Messages Functions)
+-----------------------------------------------------------------------
+
+`addToRecipient(string $address, string $attributes)`  
+
+`sendMessage(array $message, array $files)` 
+ 
+`array finalize()`  
+
+More Documentation
+------------------
+See the official [Mailgun Docs](http://documentation.mailgun.com/api-sending.html) 
+for more information.
--- a/src/Mailgun/Model/ApiResponse.php
+++ b/src/Mailgun/Model/ApiResponse.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -18,6 +16,10 @@ interface ApiResponse
 {
    /**
     * Create an API response object from the HTTP response from the API server.
+     *
+     * @param array $data
+     *
+     * @return self
     */
    public static function create(array $data);
 }
--- a/src/Mailgun/Model/Domain/AbstractDomainResponse.php
+++ b/src/Mailgun/Model/Domain/AbstractDomainResponse.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -18,21 +16,46 @@ use Mailgun\Model\ApiResponse;
 */
 abstract class AbstractDomainResponse implements ApiResponse
 {
+    /**
+     * @var string
+     */
    private $message;
+
+    /**
+     * @var Domain
+     */
    private $domain;
+
+    /**
+     * @var DnsRecord[]
+     */
    private $inboundDnsRecords;
+
+    /**
+     * @var DnsRecord[]
+     */
    private $outboundDnsRecords;

-    public static function create(array $data): self
+    /**
+     * @param array $data
+     *
+     * @return self
+     */
+    public static function create(array $data)
    {
        $rx = [];
        $tx = [];
        $domain = null;
+        $message = null;

        if (isset($data['domain'])) {
            $domain = Domain::create($data['domain']);
        }

+        if (isset($data['message'])) {
+            $message = $data['message'];
+        }
+
        if (isset($data['receiving_dns_records'])) {
            foreach ($data['receiving_dns_records'] as $item) {
                $rx[] = DnsRecord::create($item);
@ -45,41 +68,51 @@ abstract class AbstractDomainResponse implements ApiResponse
            }
        }

-        $model = new static();
-        $model->domain = $domain;
-        $model->inboundDnsRecords = $rx;
-        $model->outboundDnsRecords = $tx;
-        $model->message = $data['message'] ?? null;
-
-        return $model;
+        return new static($domain, $rx, $tx, $message);
    }

-    private function __construct()
+    /**
+     * @param Domain      $domainInfo
+     * @param DnsRecord[] $rxRecords
+     * @param DnsRecord[] $txRecords
+     * @param string      $message
+     */
+    private function __construct(Domain $domainInfo, array $rxRecords, array $txRecords, $message)
    {
+        $this->domain = $domainInfo;
+        $this->inboundDnsRecords = $rxRecords;
+        $this->outboundDnsRecords = $txRecords;
+        $this->message = $message;
    }

-    public function getDomain(): ?Domain
+    /**
+     * @return Domain
+     */
+    public function getDomain()
    {
        return $this->domain;
    }

    /**
-     * @return DnsRecord[] tx
+     * @return DnsRecord[]
     */
-    public function getInboundDNSRecords(): array
+    public function getInboundDNSRecords()
    {
        return $this->inboundDnsRecords;
    }

    /**
-     * @return DnsRecord[] tx
+     * @return DnsRecord[]
     */
-    public function getOutboundDNSRecords(): array
+    public function getOutboundDNSRecords()
    {
        return $this->outboundDnsRecords;
    }

-    public function getMessage(): ?string
+    /**
+     * @return string
+     */
+    public function getMessage()
    {
        return $this->message;
    }
--- a/src/Mailgun/Model/Domain/ConnectionResponse.php
+++ b/src/Mailgun/Model/Domain/ConnectionResponse.php
@ -0,0 +1,72 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Model\Domain;
+
+use Mailgun\Model\ApiResponse;
+
+/**
+ * @author Sean Johnson <sean@mailgun.com>
+ */
+final class ConnectionResponse implements ApiResponse
+{
+    /**
+     * @var bool
+     */
+    private $noVerify;
+
+    /**
+     * @var bool
+     */
+    private $requireTLS;
+
+    /**
+     * @param array $data
+     *
+     * @return self
+     */
+    public static function create(array $data)
+    {
+        if (!isset($data['connection'])) {
+            return;
+        }
+        $connSettings = $data['connection'];
+
+        return new self(
+            isset($connSettings['skip_verification']) ? $connSettings['skip_verification'] : null,
+            isset($connSettings['require_tls']) ? $connSettings['require_tls'] : null
+        );
+    }
+
+    /**
+     * @param bool $noVerify   Disable remote TLS certificate verification
+     * @param bool $requireTLS Requires TLS for all outbound communication
+     */
+    private function __construct($noVerify, $requireTLS)
+    {
+        $this->noVerify = $noVerify;
+        $this->requireTLS = $requireTLS;
+    }
+
+    /**
+     * @return bool
+     */
+    public function getSkipVerification()
+    {
+        return $this->noVerify;
+    }
+
+    /**
+     * @return bool
+     */
+    public function getRequireTLS()
+    {
+        return $this->requireTLS;
+    }
+}
--- a/src/Mailgun/Model/Domain/CreateCredentialResponse.php
+++ b/src/Mailgun/Model/Domain/CreateCredentialResponse.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -18,21 +16,33 @@ use Mailgun\Model\ApiResponse;
 */
 final class CreateCredentialResponse implements ApiResponse
 {
+    /**
+     * @var string
+     */
    private $message;

-    private function __construct()
+    /**
+     * @param string $message
+     */
+    private function __construct($message)
    {
+        $this->message = $message;
    }

-    public static function create(array $data): self
+    /**
+     * @param array $data
+     *
+     * @return self
+     */
+    public static function create(array $data)
    {
-        $model = new self();
-        $model->message = $data['message'] ?? null;
-
-        return $model;
+        return new self(isset($data['message']) ? $data['message'] : null);
    }

-    public function getMessage(): ?string
+    /**
+     * @return string
+     */
+    public function getMessage()
    {
        return $this->message;
    }
--- a/src/Mailgun/Model/Domain/CreateResponse.php
+++ b/src/Mailgun/Model/Domain/CreateResponse.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
--- a/src/Mailgun/Model/Domain/CredentialResponse.php
+++ b/src/Mailgun/Model/Domain/CredentialResponse.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -18,10 +16,22 @@ use Mailgun\Model\ApiResponse;
 */
 final class CredentialResponse implements ApiResponse
 {
+    /**
+     * @var int
+     */
    private $totalCount;
+
+    /**
+     * @var CredentialResponseItem[]
+     */
    private $items;

-    public static function create(array $data): self
+    /**
+     * @param array $data
+     *
+     * @return self
+     */
+    public static function create(array $data)
    {
        $items = [];
        if (isset($data['items'])) {
@ -31,23 +41,28 @@ final class CredentialResponse implements ApiResponse
        }

        if (isset($data['total_count'])) {
-            $count = (int) $data['total_count'];
+            $count = $data['total_count'];
        } else {
            $count = count($items);
        }

-        $model = new self();
-        $model->totalCount = $count;
-        $model->items = $items;
-
-        return $model;
+        return new self($count, $items);
    }

-    private function __construct()
+    /**
+     * @param int                      $totalCount
+     * @param CredentialResponseItem[] $items
+     */
+    private function __construct($totalCount, array $items)
    {
+        $this->totalCount = $totalCount;
+        $this->items = $items;
    }

-    public function getTotalCount(): int
+    /**
+     * @return int
+     */
+    public function getTotalCount()
    {
        return $this->totalCount;
    }
@ -55,7 +70,7 @@ final class CredentialResponse implements ApiResponse
    /**
     * @return CredentialResponseItem[]
     */
-    public function getCredentials(): array
+    public function getCredentials()
    {
        return $this->items;
    }
--- a/src/Mailgun/Model/Domain/CredentialResponseItem.php
+++ b/src/Mailgun/Model/Domain/CredentialResponseItem.php
@ -0,0 +1,97 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Model\Domain;
+
+/**
+ * @author Sean Johnson <sean@mailgun.com>
+ */
+final class CredentialResponseItem
+{
+    /**
+     * @var int|null
+     */
+    private $sizeBytes;
+
+    /**
+     * @var \DateTime
+     */
+    private $createdAt;
+
+    /**
+     * @var string
+     */
+    private $mailbox;
+
+    /**
+     * @var string
+     */
+    private $login;
+
+    /**
+     * @param array $data
+     *
+     * @return self
+     */
+    public static function create(array $data)
+    {
+        $sizeBytes = isset($data['size_bytes']) ? $data['size_bytes'] : null;
+        $mailbox = isset($data['mailbox']) ? $data['mailbox'] : null;
+        $login = isset($data['login']) ? $data['login'] : null;
+        $createdAt = isset($data['created_at']) ? new \DateTime($data['created_at']) : null;
+
+        return new self($sizeBytes, $createdAt, $mailbox, $login);
+    }
+
+    /**
+     * @param int       $sizeBytes
+     * @param \DateTime $createdAt
+     * @param string    $mailbox
+     * @param string    $login
+     */
+    private function __construct($sizeBytes, \DateTime $createdAt, $mailbox, $login)
+    {
+        $this->sizeBytes = $sizeBytes;
+        $this->createdAt = $createdAt;
+        $this->mailbox = $mailbox;
+        $this->login = $login;
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getSizeBytes()
+    {
+        return $this->sizeBytes;
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getCreatedAt()
+    {
+        return $this->createdAt;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMailbox()
+    {
+        return $this->mailbox;
+    }
+
+    /**
+     * @return string
+     */
+    public function getLogin()
+    {
+        return $this->login;
+    }
+}
--- a/src/Mailgun/Model/Domain/DeleteCredentialResponse.php
+++ b/src/Mailgun/Model/Domain/DeleteCredentialResponse.php
@ -0,0 +1,83 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Model\Domain;
+
+use Mailgun\Model\ApiResponse;
+
+/**
+ * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ */
+final class DeleteCredentialResponse implements ApiResponse
+{
+    /**
+     * @var string
+     */
+    private $message;
+
+    /**
+     * @var string
+     */
+    private $error;
+
+    /**
+     * @var string
+     */
+    private $spec;
+
+    /**
+     * @param string $message
+     * @param string $error
+     * @param string $spec
+     */
+    private function __construct($message, $error, $spec)
+    {
+        $this->message = $message;
+        $this->error = $error;
+        $this->spec = $spec;
+    }
+
+    /**
+     * @param array $data
+     *
+     * @return self
+     */
+    public static function create(array $data)
+    {
+        return new self(
+            isset($data['message']) ? $data['message'] : null,
+            isset($data['error']) ? $data['error'] : null,
+            isset($data['spec']) ? $data['spec'] : null
+        );
+    }
+
+    /**
+     * @return string
+     */
+    public function getMessage()
+    {
+        return $this->message;
+    }
+
+    /**
+     * @return string
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSpec()
+    {
+        return $this->spec;
+    }
+}
--- a/src/Mailgun/Model/Domain/DeleteResponse.php
+++ b/src/Mailgun/Model/Domain/DeleteResponse.php
@ -0,0 +1,67 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Model\Domain;
+
+use Mailgun\Model\ApiResponse;
+
+/**
+ * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ */
+final class DeleteResponse implements ApiResponse
+{
+    /**
+     * @var string
+     */
+    private $message;
+
+    /**
+     * @var string
+     */
+    private $error;
+
+    /**
+     * @param string $message
+     * @param string $error
+     */
+    private function __construct($message, $error)
+    {
+        $this->message = $message;
+        $this->error = $error;
+    }
+
+    /**
+     * @param array $data
+     *
+     * @return self
+     */
+    public static function create(array $data)
+    {
+        return new self(
+            isset($data['message']) ? $data['message'] : null,
+            isset($data['error']) ? $data['error'] : null
+        );
+    }
+
+    /**
+     * @return string
+     */
+    public function getMessage()
+    {
+        return $this->message;
+    }
+
+    /**
+     * @return string
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+}
--- a/src/Mailgun/Model/Domain/DnsRecord.php
+++ b/src/Mailgun/Model/Domain/DnsRecord.php
@ -0,0 +1,139 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Model\Domain;
+
+/**
+ * Represents a single DNS record for a domain.
+ *
+ * @author Sean Johnson <sean@mailgun.com>
+ */
+final class DnsRecord
+{
+    /**
+     * @var string|null
+     */
+    private $name;
+
+    /**
+     * @var string
+     */
+    private $type;
+
+    /**
+     * @var string
+     */
+    private $value;
+
+    /**
+     * @var string|null
+     */
+    private $priority;
+
+    /**
+     * @var string
+     */
+    private $valid;
+
+    /**
+     * @var array
+     */
+    private $cached;
+
+    /**
+     * @param array $data
+     *
+     * @return self
+     */
+    public static function create(array $data)
+    {
+        $name = isset($data['name']) ? $data['name'] : null;
+        $priority = isset($data['priority']) ? $data['priority'] : null;
+        $recordType = isset($data['record_type']) ? $data['record_type'] : null;
+        $value = isset($data['value']) ? $data['value'] : null;
+        $valid = isset($data['valid']) ? $data['valid'] : null;
+        $cached = isset($data['cached']) ? $data['cached'] : null;
+
+        return new self($name, $recordType, $value, $priority, $valid, $cached);
+    }
+
+    /**
+     * @param string|null $name     Name of the record, as used in CNAME, etc.
+     * @param string      $type     DNS record type
+     * @param string      $value    DNS record value
+     * @param string|null $priority Record priority, used for MX
+     * @param string      $valid    DNS record has been added to domain DNS?
+     * @param array       $cached   DNS record current value
+     */
+    private function __construct($name, $type, $value, $priority, $valid, $cached)
+    {
+        $this->name = $name;
+        $this->type = $type;
+        $this->value = $value;
+        $this->priority = $priority;
+        $this->valid = $valid;
+        $this->cached = $cached;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return string
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getPriority()
+    {
+        return $this->priority;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isValid()
+    {
+        return 'valid' === $this->valid;
+    }
+
+    /**
+     * @return string
+     */
+    public function getValidity()
+    {
+        return $this->valid;
+    }
+
+    /**
+     * @return array
+     */
+    public function getCached()
+    {
+        return $this->cached;
+    }
+}
--- a/src/Mailgun/Model/Domain/Domain.php
+++ b/src/Mailgun/Model/Domain/Domain.php
@ -0,0 +1,147 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Model\Domain;
+
+/**
+ * Represents domain information in its simplest form.
+ *
+ * @author Sean Johnson <sean@ramcloud.io>
+ */
+final class Domain
+{
+    /**
+     * @var \DateTime
+     */
+    private $createdAt;
+
+    /**
+     * @var string
+     */
+    private $smtpLogin;
+
+    /**
+     * @var string
+     */
+    private $name;
+
+    /**
+     * @var string
+     */
+    private $smtpPassword;
+
+    /**
+     * @var bool
+     */
+    private $wildcard;
+
+    /**
+     * @var string
+     */
+    private $spamAction;
+
+    /**
+     * @var string
+     */
+    private $state;
+
+    /**
+     * @param array $data
+     *
+     * @return self
+     */
+    public static function create(array $data)
+    {
+        return new self(
+            isset($data['name']) ? $data['name'] : null,
+            isset($data['smtp_login']) ? $data['smtp_login'] : null,
+            isset($data['smtp_password']) ? $data['smtp_password'] : null,
+            isset($data['wildcard']) ? $data['wildcard'] : null,
+            isset($data['spam_action']) ? $data['spam_action'] : null,
+            isset($data['state']) ? $data['state'] : null,
+            isset($data['created_at']) ? new \DateTime($data['created_at']) : null
+        );
+    }
+
+    /**
+     * @param string    $name
+     * @param string    $smtpLogin
+     * @param string    $smtpPassword
+     * @param bool      $wildcard
+     * @param string    $spamAction
+     * @param string    $state
+     * @param \DateTime $createdAt
+     */
+    private function __construct($name, $smtpLogin, $smtpPassword, $wildcard, $spamAction, $state, \DateTime $createdAt)
+    {
+        $this->name = $name;
+        $this->smtpLogin = $smtpLogin;
+        $this->smtpPassword = $smtpPassword;
+        $this->wildcard = $wildcard;
+        $this->spamAction = $spamAction;
+        $this->state = $state;
+        $this->createdAt = $createdAt;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSmtpUsername()
+    {
+        return $this->smtpLogin;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSmtpPassword()
+    {
+        return $this->smtpPassword;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isWildcard()
+    {
+        return $this->wildcard;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSpamAction()
+    {
+        return $this->spamAction;
+    }
+
+    /**
+     * @return string
+     */
+    public function getState()
+    {
+        return $this->state;
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getCreatedAt()
+    {
+        return $this->createdAt;
+    }
+}
--- a/src/Mailgun/Model/Domain/IndexResponse.php
+++ b/src/Mailgun/Model/Domain/IndexResponse.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -18,10 +16,22 @@ use Mailgun\Model\ApiResponse;
 */
 final class IndexResponse implements ApiResponse
 {
+    /**
+     * @var int
+     */
    private $totalCount;
+
+    /**
+     * @var Domain[]
+     */
    private $items;

-    public static function create(array $data): self
+    /**
+     * @param array $data
+     *
+     * @return self
+     */
+    public static function create(array $data)
    {
        $items = [];

@ -37,18 +47,23 @@ final class IndexResponse implements ApiResponse
            $count = count($items);
        }

-        $model = new self();
-        $model->totalCount = $count;
-        $model->items = $items;
-
-        return $model;
+        return new self($count, $items);
    }

-    private function __construct()
+    /**
+     * @param int      $totalCount
+     * @param Domain[] $items
+     */
+    private function __construct($totalCount, array $items)
    {
+        $this->totalCount = $totalCount;
+        $this->items = $items;
    }

-    public function getTotalCount(): int
+    /**
+     * @return int
+     */
+    public function getTotalCount()
    {
        return $this->totalCount;
    }
@ -56,7 +71,7 @@ final class IndexResponse implements ApiResponse
    /**
     * @return Domain[]
     */
-    public function getDomains(): array
+    public function getDomains()
    {
        return $this->items;
    }
--- a/src/Mailgun/Model/Domain/ShowResponse.php
+++ b/src/Mailgun/Model/Domain/ShowResponse.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -18,11 +16,27 @@ use Mailgun\Model\ApiResponse;
 */
 final class ShowResponse implements ApiResponse
 {
+    /**
+     * @var Domain
+     */
    private $domain;
+
+    /**
+     * @var DnsRecord[]
+     */
    private $inboundDnsRecords;
+
+    /**
+     * @var DnsRecord[]
+     */
    private $outboundDnsRecords;

-    public static function create(array $data): self
+    /**
+     * @param array $data
+     *
+     * @return self
+     */
+    public static function create(array $data)
    {
        $rx = [];
        $tx = [];
@ -44,19 +58,25 @@ final class ShowResponse implements ApiResponse
            }
        }

-        $model = new self();
-        $model->domain = $domain;
-        $model->inboundDnsRecords = $rx;
-        $model->outboundDnsRecords = $tx;
-
-        return $model;
+        return new self($domain, $rx, $tx);
    }

-    private function __construct()
+    /**
+     * @param Domain      $domainInfo
+     * @param DnsRecord[] $rxRecords
+     * @param DnsRecord[] $txRecords
+     */
+    private function __construct(Domain $domainInfo, array $rxRecords, array $txRecords)
    {
+        $this->domain = $domainInfo;
+        $this->inboundDnsRecords = $rxRecords;
+        $this->outboundDnsRecords = $txRecords;
    }

-    public function getDomain(): ?Domain
+    /**
+     * @return Domain
+     */
+    public function getDomain()
    {
        return $this->domain;
    }
@ -64,7 +84,7 @@ final class ShowResponse implements ApiResponse
    /**
     * @return DnsRecord[]
     */
-    public function getInboundDNSRecords(): array
+    public function getInboundDNSRecords()
    {
        return $this->inboundDnsRecords;
    }
@ -72,7 +92,7 @@ final class ShowResponse implements ApiResponse
    /**
     * @return DnsRecord[]
     */
-    public function getOutboundDNSRecords(): array
+    public function getOutboundDNSRecords()
    {
        return $this->outboundDnsRecords;
    }
--- a/src/Mailgun/Model/Domain/UpdateConnectionResponse.php
+++ b/src/Mailgun/Model/Domain/UpdateConnectionResponse.php
@ -0,0 +1,83 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Model\Domain;
+
+use Mailgun\Model\ApiResponse;
+
+/**
+ * @author Sean Johnson <sean@mailgun.com>
+ */
+final class UpdateConnectionResponse implements ApiResponse
+{
+    /**
+     * @var string
+     */
+    private $message;
+
+    /**
+     * @var bool
+     */
+    private $noVerify;
+
+    /**
+     * @var bool
+     */
+    private $requireTLS;
+
+    /**
+     * @param array $data
+     *
+     * @return self
+     */
+    public static function create(array $data)
+    {
+        $message = isset($data['message']) ? $data['message'] : null;
+        $noVerify = isset($data['skip_verification']) ? $data['skip_verification'] : null;
+        $requireTLS = isset($data['require_tls']) ? $data['require_tls'] : null;
+
+        return new self($message, $noVerify, $requireTLS);
+    }
+
+    /**
+     * @param string $message
+     * @param bool   $noVerify
+     * @param bool   $requireTLS
+     */
+    private function __construct($message, $noVerify, $requireTLS)
+    {
+        $this->message = $message;
+        $this->noVerify = $noVerify;
+        $this->requireTLS = $requireTLS;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMessage()
+    {
+        return $this->message;
+    }
+
+    /**
+     * @return bool
+     */
+    public function getSkipVerification()
+    {
+        return $this->noVerify;
+    }
+
+    /**
+     * @return bool
+     */
+    public function getRequireTLS()
+    {
+        return $this->requireTLS;
+    }
+}
--- a/src/Mailgun/Model/Domain/UpdateCredentialResponse.php
+++ b/src/Mailgun/Model/Domain/UpdateCredentialResponse.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -18,21 +16,33 @@ use Mailgun\Model\ApiResponse;
 */
 final class UpdateCredentialResponse implements ApiResponse
 {
+    /**
+     * @var string
+     */
    private $message;

-    public static function create(array $data): self
+    /**
+     * @param string $message
+     */
+    private function __construct($message)
    {
-        $model = new self();
-        $model->message = $data['message'] ?? null;
-
-        return $model;
+        $this->message = $message;
    }

-    private function __construct()
+    /**
+     * @param array $data
+     *
+     * @return self
+     */
+    public static function create(array $data)
    {
+        return new self(isset($data['message']) ? $data['message'] : null);
    }

-    public function getMessage(): ?string
+    /**
+     * @return string
+     */
+    public function getMessage()
    {
        return $this->message;
    }
--- a/src/Mailgun/Model/Domain/VerifyResponse.php
+++ b/src/Mailgun/Model/Domain/VerifyResponse.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
--- a/src/Mailgun/Model/Event/Event.php
+++ b/src/Mailgun/Model/Event/Event.php
@ -0,0 +1,505 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Model\Event;
+
+/**
+ * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ */
+class Event
+{
+    /**
+     * @var string status
+     */
+    private $event;
+
+    /**
+     * @var string
+     */
+    private $id;
+
+    /**
+     * @var float
+     */
+    private $timestamp;
+
+    /**
+     * A \DateTime representation of $timestamp.
+     *
+     * @var \DateTime
+     */
+    private $eventDate;
+
+    /**
+     * @var array|string[]
+     */
+    private $tags = [];
+
+    /**
+     * @var string
+     */
+    private $url;
+
+    /**
+     * @var string
+     */
+    private $severity;
+
+    /**
+     * @var array
+     */
+    private $envelope = [];
+
+    /**
+     * @var array
+     */
+    private $deliveryStatus;
+
+    /**
+     * @var array|string[]
+     */
+    private $campaigns = [];
+
+    /**
+     * @var string
+     */
+    private $ip;
+
+    /**
+     * @var array
+     */
+    private $clientInfo = [];
+
+    /**
+     * @var string
+     */
+    private $reason;
+
+    /**
+     * @var array
+     */
+    private $userVariables = [];
+
+    /**
+     * @var array key=>bool
+     */
+    private $flags = [];
+
+    /**
+     * @var array multi dimensions
+     */
+    private $routes = [];
+
+    /**
+     * @var array multi dimensions
+     */
+    private $message = [];
+
+    /**
+     * @var string
+     */
+    private $recipient;
+
+    /**
+     * @var array
+     */
+    private $geolocation = [];
+
+    /**
+     * @var array
+     */
+    private $storage = [];
+
+    /**
+     * @var string
+     */
+    private $method;
+
+    /**
+     * @param string $event
+     * @param string $id
+     * @param float  $timestamp
+     */
+    public function __construct($event, $id, $timestamp)
+    {
+        $this->event = $event;
+        $this->id = $id;
+        $this->timestamp = $timestamp;
+        $this->eventDate = new \DateTime();
+        $this->eventDate->setTimestamp((int) $timestamp);
+    }
+
+    /**
+     * @param array $data
+     *
+     * @return Event
+     */
+    public static function create(array $data)
+    {
+        $event = new self($data['event'], $data['id'], $data['timestamp']);
+
+        if (isset($data['tags'])) {
+            $event->setTags($data['tags']);
+        }
+        if (isset($data['envelope'])) {
+            $event->setEnvelope($data['envelope']);
+        }
+        if (isset($data['campaigns'])) {
+            $event->setCampaigns($data['campaigns']);
+        }
+        if (isset($data['user-variables'])) {
+            $event->setUserVariables($data['user-variables']);
+        }
+        if (isset($data['flags'])) {
+            $event->setFlags($data['flags']);
+        }
+        if (isset($data['routes'])) {
+            $event->setRoutes($data['routes']);
+        }
+        if (isset($data['message'])) {
+            $event->setMessage($data['message']);
+        }
+        if (isset($data['recipient'])) {
+            $event->setRecipient($data['recipient']);
+        }
+        if (isset($data['method'])) {
+            $event->setMethod($data['method']);
+        }
+        if (isset($data['delivery-status'])) {
+            $event->setDeliveryStatus($data['delivery-status']);
+        }
+        if (isset($data['severity'])) {
+            $event->setSeverity($data['severity']);
+        }
+        if (isset($data['reason'])) {
+            $event->setReason($data['reason']);
+        }
+        if (isset($data['geolocation'])) {
+            $event->setGeolocation($data['geolocation']);
+        }
+        if (isset($data['ip'])) {
+            $event->setIp($data['ip']);
+        }
+        if (isset($data['client-info'])) {
+            $event->setClientInfo($data['client-info']);
+        }
+        if (isset($data['url'])) {
+            $event->setUrl($data['url']);
+        }
+        if (isset($data['storage'])) {
+            $event->setStorage($data['storage']);
+        }
+
+        return $event;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEvent()
+    {
+        return $this->event;
+    }
+
+    /**
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return float
+     */
+    public function getTimestamp()
+    {
+        return $this->timestamp;
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getEventDate()
+    {
+        return $this->eventDate;
+    }
+
+    /**
+     * @return array|\string[]
+     */
+    public function getTags()
+    {
+        return $this->tags;
+    }
+
+    /**
+     * @param array|\string[] $tags
+     */
+    private function setTags($tags)
+    {
+        $this->tags = $tags;
+    }
+
+    /**
+     * @return string
+     */
+    public function getUrl()
+    {
+        return $this->url;
+    }
+
+    /**
+     * @param string $url
+     */
+    private function setUrl($url)
+    {
+        $this->url = $url;
+    }
+
+    /**
+     * @return array
+     */
+    public function getEnvelope()
+    {
+        return $this->envelope;
+    }
+
+    /**
+     * @param array $envelope
+     */
+    private function setEnvelope($envelope)
+    {
+        $this->envelope = $envelope;
+    }
+
+    /**
+     * @return array
+     */
+    public function getDeliveryStatus()
+    {
+        return $this->deliveryStatus;
+    }
+
+    /**
+     * @param array $deliveryStatus
+     */
+    private function setDeliveryStatus($deliveryStatus)
+    {
+        $this->deliveryStatus = $deliveryStatus;
+    }
+
+    /**
+     * @return array|\string[]
+     */
+    public function getCampaigns()
+    {
+        return $this->campaigns;
+    }
+
+    /**
+     * @param array|\string[] $campaigns
+     */
+    private function setCampaigns($campaigns)
+    {
+        $this->campaigns = $campaigns;
+    }
+
+    /**
+     * @return string
+     */
+    public function getIp()
+    {
+        return $this->ip;
+    }
+
+    /**
+     * @param string $ip
+     */
+    private function setIp($ip)
+    {
+        $this->ip = $ip;
+    }
+
+    /**
+     * @return array
+     */
+    public function getClientInfo()
+    {
+        return $this->clientInfo;
+    }
+
+    /**
+     * @param array $clientInfo
+     */
+    private function setClientInfo($clientInfo)
+    {
+        $this->clientInfo = $clientInfo;
+    }
+
+    /**
+     * @return string
+     */
+    public function getReason()
+    {
+        return $this->reason;
+    }
+
+    /**
+     * @param string $reason
+     */
+    private function setReason($reason)
+    {
+        $this->reason = $reason;
+    }
+
+    /**
+     * @return array
+     */
+    public function getUserVariables()
+    {
+        return $this->userVariables;
+    }
+
+    /**
+     * @param array $userVariables
+     */
+    private function setUserVariables($userVariables)
+    {
+        $this->userVariables = $userVariables;
+    }
+
+    /**
+     * @return array
+     */
+    public function getFlags()
+    {
+        return $this->flags;
+    }
+
+    /**
+     * @param array $flags
+     */
+    private function setFlags($flags)
+    {
+        $this->flags = $flags;
+    }
+
+    /**
+     * @return array
+     */
+    public function getRoutes()
+    {
+        return $this->routes;
+    }
+
+    /**
+     * @param array $routes
+     */
+    private function setRoutes($routes)
+    {
+        $this->routes = $routes;
+    }
+
+    /**
+     * @return array
+     */
+    public function getMessage()
+    {
+        return $this->message;
+    }
+
+    /**
+     * @param array $message
+     */
+    private function setMessage($message)
+    {
+        $this->message = $message;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRecipient()
+    {
+        return $this->recipient;
+    }
+
+    /**
+     * @param string $recipient
+     */
+    private function setRecipient($recipient)
+    {
+        $this->recipient = $recipient;
+    }
+
+    /**
+     * @return array
+     */
+    public function getGeolocation()
+    {
+        return $this->geolocation;
+    }
+
+    /**
+     * @param array $geolocation
+     */
+    private function setGeolocation($geolocation)
+    {
+        $this->geolocation = $geolocation;
+    }
+
+    /**
+     * @return array
+     */
+    public function getStorage()
+    {
+        return $this->storage;
+    }
+
+    /**
+     * @param array $storage
+     */
+    private function setStorage($storage)
+    {
+        $this->storage = $storage;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMethod()
+    {
+        return $this->method;
+    }
+
+    /**
+     * @param string $method
+     */
+    private function setMethod($method)
+    {
+        $this->method = $method;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSeverity()
+    {
+        return $this->severity;
+    }
+
+    /**
+     * @param string $severity
+     */
+    private function setSeverity($severity)
+    {
+        $this->severity = $severity;
+    }
+}
--- a/src/Mailgun/Model/Event/EventResponse.php
+++ b/src/Mailgun/Model/Event/EventResponse.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -18,13 +16,23 @@ use Mailgun\Model\ApiResponse;
 /**
 * @author Tobias Nyholm <tobias.nyholm@gmail.com>
 */
-final class EventResponse implements ApiResponse, PagingProvider
+class EventResponse implements ApiResponse, PagingProvider
 {
    use PaginationResponse;
+
+    /**
+     * @var Event[]
+     */
    private $items;

-    private function __construct()
+    /**
+     * @param Event[] $items
+     * @param array   $paging
+     */
+    public function __construct(array $items, array $paging)
    {
+        $this->items = $items;
+        $this->paging = $paging;
    }

    public static function create(array $data)
@ -36,17 +44,13 @@ final class EventResponse implements ApiResponse, PagingProvider
            }
        }

-        $model = new self();
-        $model->items = $events;
-        $model->paging = $data['paging'];
-
-        return $model;
+        return new self($events, $data['paging']);
    }

    /**
     * @return Event[]
     */
-    public function getItems(): array
+    public function getItems()
    {
        return $this->items;
    }
--- a/src/Mailgun/Model/Message/SendResponse.php
+++ b/src/Mailgun/Model/Message/SendResponse.php
@ -0,0 +1,74 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Model\Message;
+
+use Mailgun\Model\ApiResponse;
+
+/**
+ * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ */
+class SendResponse implements ApiResponse
+{
+    /**
+     * @var string
+     */
+    private $id;
+
+    /**
+     * @var string
+     */
+    private $message;
+
+    /**
+     * @param string $id
+     * @param string $message
+     */
+    private function __construct($id, $message)
+    {
+        $this->id = $id;
+        $this->message = $message;
+    }
+
+    /**
+     * @param array $data
+     *
+     * @return SendResponse
+     */
+    public static function create(array $data)
+    {
+        $id = '';
+        $message = '';
+
+        if (isset($data['id'])) {
+            $id = $data['id'];
+        }
+        if (isset($data['message'])) {
+            $message = $data['message'];
+        }
+
+        return new self($id, $message);
+    }
+
+    /**
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMessage()
+    {
+        return $this->message;
+    }
+}
--- a/src/Mailgun/Model/Message/ShowResponse.php
+++ b/src/Mailgun/Model/Message/ShowResponse.php
@ -0,0 +1,402 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Model\Message;
+
+use Mailgun\Model\ApiResponse;
+
+/**
+ * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ */
+class ShowResponse implements ApiResponse
+{
+    /**
+     * Only available with message/rfc2822.
+     *
+     * @var string
+     */
+    private $recipient;
+
+    /**
+     * Only available with message/rfc2822.
+     *
+     * @var string
+     */
+    private $bodyMime;
+
+    /**
+     * @var string
+     */
+    private $recipients;
+
+    /**
+     * @var string
+     */
+    private $sender;
+
+    /**
+     * @var string
+     */
+    private $from;
+
+    /**
+     * @var string
+     */
+    private $subject;
+
+    /**
+     * @var string
+     */
+    private $bodyPlain;
+
+    /**
+     * @var string
+     */
+    private $strippedText;
+
+    /**
+     * @var string
+     */
+    private $strippedSignature;
+
+    /**
+     * @var string
+     */
+    private $bodyHtml;
+
+    /**
+     * @var string
+     */
+    private $strippedHtml;
+
+    /**
+     * @var array
+     */
+    private $attachments;
+
+    /**
+     * @var string
+     */
+    private $messageUrl;
+
+    /**
+     * @var string
+     */
+    private $contentIdMap;
+
+    /**
+     * @var array
+     */
+    private $messageHeaders;
+
+    /**
+     * Do not let this object be creted without the ::create.
+     */
+    private function __construct()
+    {
+    }
+
+    /**
+     * @param array $data
+     *
+     * @return SendResponse
+     */
+    public static function create(array $data)
+    {
+        $response = new self();
+
+        if (isset($data['recipients'])) {
+            $response->setRecipients($data['recipients']);
+        }
+        if (isset($data['sender'])) {
+            $response->setSender($data['sender']);
+        }
+        if (isset($data['from'])) {
+            $response->setFrom($data['from']);
+        }
+        if (isset($data['subject'])) {
+            $response->setSubject($data['subject']);
+        }
+        if (isset($data['body-plain'])) {
+            $response->setBodyPlain($data['body-plain']);
+        }
+        if (isset($data['stripped-text'])) {
+            $response->setStrippedText($data['stripped-text']);
+        }
+        if (isset($data['stripped-signature'])) {
+            $response->setStrippedSignature($data['stripped-signature']);
+        }
+        if (isset($data['body-html'])) {
+            $response->setBodyHtml($data['body-html']);
+        }
+        if (isset($data['stripped-html'])) {
+            $response->setStrippedHtml($data['stripped-html']);
+        }
+        if (isset($data['message-url'])) {
+            $response->setMessageUrl($data['message-url']);
+        }
+        if (isset($data['message-headers'])) {
+            $response->setMessageHeaders($data['message-headers']);
+        }
+        if (isset($data['recipient'])) {
+            $response->setRecipient($data['recipient']);
+        }
+        if (isset($data['body-mime'])) {
+            $response->setBodyMime($data['body-mime']);
+        }
+        if (isset($data['attachments'])) {
+            $response->setAttachments($data['attachments']);
+        }
+        if (isset($data['content-id-map'])) {
+            $response->setContentIdMap($data['content-id-map']);
+        }
+
+        return $response;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRecipient()
+    {
+        return $this->recipient;
+    }
+
+    /**
+     * @param string $recipient
+     */
+    private function setRecipient($recipient)
+    {
+        $this->recipient = $recipient;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBodyMime()
+    {
+        return $this->bodyMime;
+    }
+
+    /**
+     * @param string $bodyMime
+     */
+    private function setBodyMime($bodyMime)
+    {
+        $this->bodyMime = $bodyMime;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRecipients()
+    {
+        return $this->recipients;
+    }
+
+    /**
+     * @param string $recipients
+     */
+    private function setRecipients($recipients)
+    {
+        $this->recipients = $recipients;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSender()
+    {
+        return $this->sender;
+    }
+
+    /**
+     * @param string $sender
+     */
+    private function setSender($sender)
+    {
+        $this->sender = $sender;
+    }
+
+    /**
+     * @return string
+     */
+    public function getFrom()
+    {
+        return $this->from;
+    }
+
+    /**
+     * @param string $from
+     */
+    private function setFrom($from)
+    {
+        $this->from = $from;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSubject()
+    {
+        return $this->subject;
+    }
+
+    /**
+     * @param string $subject
+     */
+    private function setSubject($subject)
+    {
+        $this->subject = $subject;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBodyPlain()
+    {
+        return $this->bodyPlain;
+    }
+
+    /**
+     * @param string $bodyPlain
+     */
+    private function setBodyPlain($bodyPlain)
+    {
+        $this->bodyPlain = $bodyPlain;
+    }
+
+    /**
+     * @return string
+     */
+    public function getStrippedText()
+    {
+        return $this->strippedText;
+    }
+
+    /**
+     * @param string $strippedText
+     */
+    private function setStrippedText($strippedText)
+    {
+        $this->strippedText = $strippedText;
+    }
+
+    /**
+     * @return string
+     */
+    public function getStrippedSignature()
+    {
+        return $this->strippedSignature;
+    }
+
+    /**
+     * @param string $strippedSignature
+     */
+    private function setStrippedSignature($strippedSignature)
+    {
+        $this->strippedSignature = $strippedSignature;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBodyHtml()
+    {
+        return $this->bodyHtml;
+    }
+
+    /**
+     * @param string $bodyHtml
+     */
+    private function setBodyHtml($bodyHtml)
+    {
+        $this->bodyHtml = $bodyHtml;
+    }
+
+    /**
+     * @return string
+     */
+    public function getStrippedHtml()
+    {
+        return $this->strippedHtml;
+    }
+
+    /**
+     * @param string $strippedHtml
+     */
+    private function setStrippedHtml($strippedHtml)
+    {
+        $this->strippedHtml = $strippedHtml;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAttachments()
+    {
+        return $this->attachments;
+    }
+
+    /**
+     * @param array $attachments
+     */
+    private function setAttachments($attachments)
+    {
+        $this->attachments = $attachments;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMessageUrl()
+    {
+        return $this->messageUrl;
+    }
+
+    /**
+     * @param string $messageUrl
+     */
+    private function setMessageUrl($messageUrl)
+    {
+        $this->messageUrl = $messageUrl;
+    }
+
+    /**
+     * @return string
+     */
+    public function getContentIdMap()
+    {
+        return $this->contentIdMap;
+    }
+
+    /**
+     * @param string $contentIdMap
+     */
+    public function setContentIdMap($contentIdMap)
+    {
+        $this->contentIdMap = $contentIdMap;
+    }
+
+    /**
+     * @return array
+     */
+    public function getMessageHeaders()
+    {
+        return $this->messageHeaders;
+    }
+
+    /**
+     * @param array $messageHeaders
+     */
+    private function setMessageHeaders(array $messageHeaders)
+    {
+        $this->messageHeaders = $messageHeaders;
+    }
+}
--- a/src/Mailgun/Model/PaginationResponse.php
+++ b/src/Mailgun/Model/PaginationResponse.php
@ -0,0 +1,69 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Model;
+
+/**
+ * @author Tobias Nyholm <tobias.nyholm@gmail.com>
+ */
+trait PaginationResponse
+{
+    /**
+     * @var array
+     */
+    protected $paging;
+
+    /**
+     * @return string
+     */
+    public function getNextUrl()
+    {
+        if (!isset($this->paging['next'])) {
+            return;
+        }
+
+        return $this->paging['next'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getPreviousUrl()
+    {
+        if (!isset($this->paging['previous'])) {
+            return;
+        }
+
+        return $this->paging['previous'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getFirstUrl()
+    {
+        if (!isset($this->paging['first'])) {
+            return;
+        }
+
+        return $this->paging['first'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getLastUrl()
+    {
+        if (!isset($this->paging['last'])) {
+            return;
+        }
+
+        return $this->paging['last'];
+    }
+}
--- a/src/Mailgun/Model/PagingProvider.php
+++ b/src/Mailgun/Model/PagingProvider.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -18,21 +16,29 @@ interface PagingProvider
 {
    /**
     * Returns the `$paging->next` URL.
+     *
+     * @return string
     */
-    public function getNextUrl(): ?string;
+    public function getNextUrl();

    /**
     * Returns the `$paging->prev` URL.
+     *
+     * @return string
     */
-    public function getPreviousUrl(): ?string;
+    public function getPreviousUrl();

    /**
     * Returns the `$paging->first` URL.
+     *
+     * @return string
     */
-    public function getFirstUrl(): ?string;
+    public function getFirstUrl();

    /**
     * Returns the `$paging->last` URL.
+     *
+     * @return string
     */
-    public function getLastUrl(): ?string;
+    public function getLastUrl();
 }
--- a/src/Mailgun/Model/Route/Action.php
+++ b/src/Mailgun/Model/Route/Action.php
@ -1,7 +1,5 @@
 <?php

-declare(strict_types=1);
-
 /*
 * Copyright (C) 2013 Mailgun
 *
@ -16,11 +14,16 @@ namespace Mailgun\Model\Route;
 */
 final class Action
 {
+    /**
+     * @var string
+     */
    private $action;

    /**
     * Action Named Constructor to build several Action DTOs provided by an Array.
     *
+     * @param array $data
+     *
     * @return Action[]
     */
    public static function createMultiple(array $data)
@ -34,12 +37,20 @@ final class Action
        return $items;
    }

-    private function __construct(string $action)
+    /**
+     * Action Private Constructor.
+     *
+     * @param $action
+     */
+    private function __construct($action)
    {
        $this->action = $action;
    }

-    public function getAction(): string
+    /**
+     * @return string
+     */
+    public function getAction()
    {
        return $this->action;
    }
--- a/src/Mailgun/Model/Route/Response/CreateResponse.php
+++ b/src/Mailgun/Model/Route/Response/CreateResponse.php
@ -0,0 +1,68 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Model\Route\Response;
+
+use Mailgun\Model\Route\Route;
+use Mailgun\Model\ApiResponse;
+
+/**
+ * @author David Garcia <me@davidgarcia.cat>
+ */
+final class CreateResponse implements ApiResponse
+{
+    /**
+     * @var string
+     */
+    private $message;
+
+    /**
+     * @var Route
+     */
+    private $route;
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function create(array $data)
+    {
+        $message = isset($data['message']) ? $data['message'] : null;
+        $route = isset($data['route']) ? Route::create($data['route']) : null;
+
+        return new self($message, $route);
+    }
+
+    /**
+     * CreateResponse Private Constructor.
+     *
+     * @param string|null $message
+     * @param Route|null  $route
+     */
+    private function __construct($message = null, Route $route = null)
+    {
+        $this->message = $message;
+        $this->route = $route;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMessage()
+    {
+        return $this->message;
+    }
+
+    /**
+     * @return Route
+     */
+    public function getRoute()
+    {
+        return $this->route;
+    }
+}
--- a/src/Mailgun/Model/Route/Response/DeleteResponse.php
+++ b/src/Mailgun/Model/Route/Response/DeleteResponse.php
@ -0,0 +1,67 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Model\Route\Response;
+
+use Mailgun\Model\ApiResponse;
+
+/**
+ * @author David Garcia <me@davidgarcia.cat>
+ */
+final class DeleteResponse implements ApiResponse
+{
+    /**
+     * @var string
+     */
+    private $message;
+
+    /**
+     * @var string
+     */
+    private $error;
+
+    /**
+     * @param array $data
+     *
+     * @return self
+     */
+    public static function create(array $data)
+    {
+        return new self(
+            isset($data['message']) ? $data['message'] : null,
+            isset($data['error']) ? $data['error'] : null
+        );
+    }
+
+    /**
+     * @param string $message
+     * @param string $error
+     */
+    private function __construct($message, $error)
+    {
+        $this->message = $message;
+        $this->error = $error;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMessage()
+    {
+        return $this->message;
+    }
+
+    /**
+     * @return string
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+}
--- a/src/Mailgun/Model/Route/Response/IndexResponse.php
+++ b/src/Mailgun/Model/Route/Response/IndexResponse.php
@ -0,0 +1,77 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Model\Route\Response;
+
+use Mailgun\Model\Route\Route;
+use Mailgun\Model\ApiResponse;
+
+/**
+ * @author David Garcia <me@davidgarcia.cat>
+ */
+final class IndexResponse implements ApiResponse
+{
+    /**
+     * @var int
+     */
+    private $totalCount;
+
+    /**
+     * @var Route[]
+     */
+    private $items;
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function create(array $data)
+    {
+        $items = [];
+
+        if (isset($data['items'])) {
+            foreach ($data['items'] as $item) {
+                $items[] = Route::create($item);
+            }
+        }
+
+        if (isset($data['total_count'])) {
+            $count = $data['total_count'];
+        } else {
+            $count = count($items);
+        }
+
+        return new self($count, $items);
+    }
+
+    /**
+     * @param int     $totalCount
+     * @param Route[] $items
+     */
+    private function __construct($totalCount, array $items)
+    {
+        $this->totalCount = $totalCount;
+        $this->items = $items;
+    }
+
+    /**
+     * @return int
+     */
+    public function getTotalCount()
+    {
+        return $this->totalCount;
+    }
+
+    /**
+     * @return Route[]
+     */
+    public function getRoutes()
+    {
+        return $this->items;
+    }
+}
--- a/src/Mailgun/Model/Route/Response/ShowResponse.php
+++ b/src/Mailgun/Model/Route/Response/ShowResponse.php
@ -0,0 +1,54 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Model\Route\Response;
+
+use Mailgun\Model\Route\Route;
+use Mailgun\Model\ApiResponse;
+
+/**
+ * @author David Garcia <me@davidgarcia.cat>
+ */
+final class ShowResponse implements ApiResponse
+{
+    /**
+     * @var Route|null
+     */
+    private $route;
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function create(array $data)
+    {
+        if (isset($data['route'])) {
+            return new self(Route::create($data['route']));
+        }
+
+        return new self();
+    }
+
+    /**
+     * ShowResponse constructor.
+     *
+     * @param Route|null $route
+     */
+    private function __construct(Route $route = null)
+    {
+        $this->route = $route;
+    }
+
+    /**
+     * @return Route|null
+     */
+    public function getRoute()
+    {
+        return $this->route;
+    }
+}
--- a/src/Mailgun/Model/Route/Response/UpdateResponse.php
+++ b/src/Mailgun/Model/Route/Response/UpdateResponse.php
@ -0,0 +1,68 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Model\Route\Response;
+
+use Mailgun\Model\ApiResponse;
+use Mailgun\Model\Route\Route;
+
+/**
+ * @author David Garcia <me@davidgarcia.cat>
+ */
+final class UpdateResponse implements ApiResponse
+{
+    /**
+     * @var string|null
+     */
+    private $message;
+
+    /**
+     * @var Route|null
+     */
+    private $route;
+
+    /**
+     * @param array $data
+     *
+     * @return self
+     */
+    public static function create(array $data)
+    {
+        $message = isset($data['message']) ? $data['message'] : null;
+        $route = isset($data['id']) ? Route::create($data) : null;
+
+        return new self($message, $route);
+    }
+
+    /**
+     * @param string|null $message
+     * @param Route|null  $route
+     */
+    private function __construct($message = null, Route $route = null)
+    {
+        $this->message = $message;
+        $this->route = $route;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getMessage()
+    {
+        return $this->message;
+    }
+
+    /**
+     * @return Route|null
+     */
+    public function getRoute()
+    {
+        return $this->route;
+    }
+}
--- a/src/Mailgun/Model/Route/Route.php
+++ b/src/Mailgun/Model/Route/Route.php
@ -0,0 +1,133 @@
+<?php
+
+/*
+ * Copyright (C) 2013 Mailgun
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+
+namespace Mailgun\Model\Route;
+
+/**
+ * @author David Garcia <me@davidgarcia.cat>
+ */
+final class Route
+{
+    /**
+     * @var string
+     */
+    private $id;
+
+    /**
+     * @var int
+     */
+    private $priority;
+
+    /**
+     * @var string
+     */
+    private $filter;
+
+    /**
+     * @var Action[]
+     */
+    private $actions;
+
+    /**
+     * @var string
+     */
+    private $description;
+
+    /**
+     * @var \DateTime
+     */
+    private $createdAt;
+
+    /**
+     * Route Named Constructor.
+     *
+     * @param array $data
+     *
+     * @return Route
+     */
+    public static function create(array $data)
+    {
+        return new self(
+            isset($data['id']) ? $data['id'] : null,
+            isset($data['priority']) ? $data['priority'] : null,
+            isset($data['expression']) ? $data['expression'] : null,
+            isset($data['actions']) ? $data['actions'] : [],
+            isset($data['description']) ? $data['description'] : null,
+            isset($data['created_at']) ? new \DateTime($data['created_at']) : null
+        );
+    }
+
+    /**
+     * Route Private Constructor.
+     *
+     * @param string    $id
+     * @param int       $priority
+     * @param string    $expression
+     * @param array     $actions
+     * @param string    $description
+     * @param \DateTime $createdAt
+     */
+    private function __construct($id, $priority, $expression, $actions, $description, \DateTime $createdAt = null)
+    {
+        $this->id = $id;
+        $this->priority = $priority;
+        $this->filter = $expression;
+        $this->actions = Action::createMultiple($actions);
+        $this->description = $description;
+        $this->createdAt = $createdAt;
+    }
+
+    /**
+     * @return string
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return Action[]
+     */
+    public function getActions()
+    {
+        return $this->actions;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDescription()
+    {
+        return $this->description;
+    }
+
+    /**
+     * @return string
+     */
+    public function getFilter()
+    {
+        return $this->filter;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPriority()
+    {
+        return $this->priority;
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getCreatedAt()
+    {
+        return $this->createdAt;
+    }
+}
--- a/Show more
+++ b/Show more