diff --git a/lib/Discovery/Crm/Commerce/Discovery.php b/lib/Discovery/Crm/Commerce/Discovery.php
new file mode 100644
index 000000000..a7ea6e080
--- /dev/null
+++ b/lib/Discovery/Crm/Commerce/Discovery.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace HubSpot\Discovery\Crm\Commerce;
+
+use HubSpot\Discovery\DiscoveryBase;
+
+/**
+ * @method Invoices\Discovery invoices()
+ */
+class Discovery extends DiscoveryBase {}
diff --git a/lib/Discovery/Crm/Commerce/Invoices/Discovery.php b/lib/Discovery/Crm/Commerce/Invoices/Discovery.php
new file mode 100644
index 000000000..bc35da563
--- /dev/null
+++ b/lib/Discovery/Crm/Commerce/Invoices/Discovery.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace HubSpot\Discovery\Crm\Commerce\Invoices;
+
+use HubSpot\Client\Crm\Commerce\Invoices\Api\BasicApi;
+use HubSpot\Client\Crm\Commerce\Invoices\Api\BatchApi;
+use HubSpot\Client\Crm\Commerce\Invoices\Api\SearchApi;
+use HubSpot\Discovery\DiscoveryBase;
+
+/**
+ * @method BasicApi  basicApi()
+ * @method BatchApi  batchApi()
+ * @method SearchApi searchApi()
+ */
+class Discovery extends DiscoveryBase {}
diff --git a/lib/Discovery/Crm/Discovery.php b/lib/Discovery/Crm/Discovery.php
index d0db150fd..40ebec5c7 100644
--- a/lib/Discovery/Crm/Discovery.php
+++ b/lib/Discovery/Crm/Discovery.php
@@ -6,9 +6,11 @@
 
 /**
  * @method Associations\Discovery associations()
+ * @method Commerce\Discovery     commerce()
  * @method Companies\Discovery    companies()
  * @method Contacts\Discovery     contacts()
  * @method Deals\Discovery        deals()
+ * @method Exports\Discovery      exports()
  * @method Extensions\Discovery   extensions()
  * @method Imports\Discovery      imports()
  * @method LineItems\Discovery    lineItems()
diff --git a/lib/Discovery/Crm/Exports/Discovery.php b/lib/Discovery/Crm/Exports/Discovery.php
new file mode 100644
index 000000000..bcfd38bfb
--- /dev/null
+++ b/lib/Discovery/Crm/Exports/Discovery.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace HubSpot\Discovery\Crm\Exports;
+
+use HubSpot\Client\Crm\Exports\Api\PublicExportsApi;
+use HubSpot\Discovery\Crm\ObjectDiscovery;
+
+/**
+ * @method PublicExportsApi publicExportsApi()
+ */
+class Discovery extends ObjectDiscovery {}
diff --git a/lib/Discovery/Crm/Objects/DealSplits/Discovery.php b/lib/Discovery/Crm/Objects/DealSplits/Discovery.php
new file mode 100644
index 000000000..a03622466
--- /dev/null
+++ b/lib/Discovery/Crm/Objects/DealSplits/Discovery.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace HubSpot\Discovery\Crm\Objects\DealSplits;
+
+use HubSpot\Client\Crm\Objects\DealSplits\Api\BatchApi;
+use HubSpot\Discovery\DiscoveryBase;
+
+/**
+ * @method BatchApi batchApi()
+ */
+class Discovery extends DiscoveryBase {}
diff --git a/lib/Discovery/Crm/Objects/Discovery.php b/lib/Discovery/Crm/Objects/Discovery.php
index 9077f1e5d..30cba445f 100644
--- a/lib/Discovery/Crm/Objects/Discovery.php
+++ b/lib/Discovery/Crm/Objects/Discovery.php
@@ -12,6 +12,7 @@
  * @method BatchApi                      batchApi()
  * @method Calls\Discovery               calls()
  * @method Communications\Discovery      communications()
+ * @method DealSplits\Discovery          dealSplits()
  * @method Emails\Discovery              emails()
  * @method FeedbackSubmissions\Discovery feedbackSubmissions()
  * @method Goals\Discovery               goals()
diff --git a/lib/Discovery/Marketing/Discovery.php b/lib/Discovery/Marketing/Discovery.php
index 9bd9c5c08..3b9085842 100644
--- a/lib/Discovery/Marketing/Discovery.php
+++ b/lib/Discovery/Marketing/Discovery.php
@@ -5,6 +5,7 @@
 use HubSpot\Discovery\DiscoveryBase;
 
 /**
+ * @method Emails\Discovery        emails()
  * @method Events\Discovery        events()
  * @method Forms\Discovery         forms()
  * @method Transactional\Discovery transactional()
diff --git a/lib/Discovery/Marketing/Emails/Discovery.php b/lib/Discovery/Marketing/Emails/Discovery.php
new file mode 100644
index 000000000..2cd8b564d
--- /dev/null
+++ b/lib/Discovery/Marketing/Emails/Discovery.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace HubSpot\Discovery\Marketing\Emails;
+
+use HubSpot\Client\Marketing\Emails\Api\MarketingEmailsApi;
+use HubSpot\Client\Marketing\Emails\Api\StatisticsApi;
+use HubSpot\Discovery\DiscoveryBase;
+
+/**
+ * @method MarketingEmailsApi marketingEmailsApi()
+ * @method StatisticsApi      statisticsApi()
+ */
+class Discovery extends DiscoveryBase {}
diff --git a/lib/Discovery/Marketing/Events/Discovery.php b/lib/Discovery/Marketing/Events/Discovery.php
index b26d43976..d8d533322 100644
--- a/lib/Discovery/Marketing/Events/Discovery.php
+++ b/lib/Discovery/Marketing/Events/Discovery.php
@@ -11,11 +11,11 @@
 use HubSpot\Discovery\DiscoveryBase;
 
 /**
- * @method AttendanceSubscriberStateChangesApi  attendanceSubscriberStateChangesApi()
- * @method BasicApi                             basicApi()
- * @method ListAssociationsApi                  listAssociationsApi()
- * @method ParticipantStateApi                  participantStateApi()
- * @method SettingsApi                          settingsApi()
- * @method SubscriberStateChangesApi            subscriberStateChangesApi()
+ * @method AttendanceSubscriberStateChangesApi attendanceSubscriberStateChangesApi()
+ * @method BasicApi                            basicApi()
+ * @method ListAssociationsApi                 listAssociationsApi()
+ * @method ParticipantStateApi                 participantStateApi()
+ * @method SettingsApi                         settingsApi()
+ * @method SubscriberStateChangesApi           subscriberStateChangesApi()
  */
 class Discovery extends DiscoveryBase {}
diff --git a/tests/spec/Discovery/Crm/Commerce/DiscoverySpec.php b/tests/spec/Discovery/Crm/Commerce/DiscoverySpec.php
new file mode 100644
index 000000000..eb794030b
--- /dev/null
+++ b/tests/spec/Discovery/Crm/Commerce/DiscoverySpec.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace spec\HubSpot\Discovery\Crm\Objects;
+
+use GuzzleHttp\Client;
+use HubSpot\Config;
+use HubSpot\Discovery\Crm\Commerce\Discovery;
+use HubSpot\Discovery\Crm\Commerce\Invoices\Discovery as InvoicesDiscovery;
+use PhpSpec\ObjectBehavior;
+
+class DiscoverySpec extends ObjectBehavior
+{
+    public function let(Client $client, Config $config)
+    {
+        $this->beConstructedWith($client, $config);
+    }
+
+    public function it_is_initializable()
+    {
+        $this->shouldHaveType(Discovery::class);
+    }
+
+    public function it_creates_clients()
+    {
+        $this->invoices()->shouldHaveType(InvoicesDiscovery::class);
+    }
+}
diff --git a/tests/spec/Discovery/Crm/Commerce/Invoices/DiscoverySpec.php b/tests/spec/Discovery/Crm/Commerce/Invoices/DiscoverySpec.php
new file mode 100644
index 000000000..fc687df9a
--- /dev/null
+++ b/tests/spec/Discovery/Crm/Commerce/Invoices/DiscoverySpec.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace spec\HubSpot\Discovery\Crm\Commerce\Invoices;
+
+use GuzzleHttp\Client;
+use HubSpot\Client\Crm\Commerce\Invoices\Api\BasicApi;
+use HubSpot\Client\Crm\Commerce\Invoices\Api\BatchApi;
+use HubSpot\Client\Crm\Commerce\Invoices\Api\SearchApi;
+use HubSpot\Config;
+use HubSpot\Discovery\Crm\Commerce\Invoices\Discovery;
+use PhpSpec\ObjectBehavior;
+
+class DiscoverySpec extends ObjectBehavior
+{
+    public function let(Client $client, Config $config)
+    {
+        $this->beConstructedWith($client, $config);
+    }
+
+    public function it_is_initializable()
+    {
+        $this->shouldHaveType(Discovery::class);
+    }
+
+    public function it_creates_clients()
+    {
+        $this->basicApi()->shouldHaveType(BasicApi::class);
+        $this->batchApi()->shouldHaveType(BatchApi::class);
+        $this->searchApi()->shouldHaveType(SearchApi::class);
+    }
+}
diff --git a/tests/spec/Discovery/Crm/DiscoverySpec.php b/tests/spec/Discovery/Crm/DiscoverySpec.php
index 546f372db..46a219af3 100644
--- a/tests/spec/Discovery/Crm/DiscoverySpec.php
+++ b/tests/spec/Discovery/Crm/DiscoverySpec.php
@@ -22,9 +22,11 @@ public function it_is_initializable()
     public function it_creates_clients()
     {
         $this->associations()->shouldHaveType(\HubSpot\Discovery\Crm\Associations\Discovery::class);
+        $this->commerce()->shouldHaveType(\HubSpot\Discovery\Crm\Commerce\Discovery::class);
         $this->companies()->shouldHaveType(\HubSpot\Discovery\Crm\Companies\Discovery::class);
         $this->contacts()->shouldHaveType(\HubSpot\Discovery\Crm\Contacts\Discovery::class);
         $this->deals()->shouldHaveType(\HubSpot\Discovery\Crm\Deals\Discovery::class);
+        $this->exports()->shouldHaveType(\HubSpot\Discovery\Crm\Exports\Discovery::class);
         $this->extensions()->shouldHaveType(\HubSpot\Discovery\Crm\Extensions\Discovery::class);
         $this->imports()->shouldHaveType(\HubSpot\Discovery\Crm\Imports\Discovery::class);
         $this->lineItems()->shouldHaveType(\HubSpot\Discovery\Crm\LineItems\Discovery::class);
diff --git a/tests/spec/Discovery/Crm/Exports/DiscoverySpec.php b/tests/spec/Discovery/Crm/Exports/DiscoverySpec.php
new file mode 100644
index 000000000..2226aa60c
--- /dev/null
+++ b/tests/spec/Discovery/Crm/Exports/DiscoverySpec.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace spec\HubSpot\Discovery\Crm\Exports;
+
+use GuzzleHttp\Client;
+use HubSpot\Client\Crm\Exports\Api\PublicExportsApi;
+use HubSpot\Config;
+use HubSpot\Discovery\Crm\Exports\Discovery;
+use PhpSpec\ObjectBehavior;
+
+class DiscoverySpec extends ObjectBehavior
+{
+    public function let(Client $client, Config $config)
+    {
+        $this->beConstructedWith($client, $config);
+    }
+
+    public function it_is_initializable()
+    {
+        $this->shouldHaveType(Discovery::class);
+    }
+
+    public function it_creates_clients()
+    {
+        $this->publicExportsApi()->shouldHaveType(PublicExportsApi::class);
+    }
+}
diff --git a/tests/spec/Discovery/Crm/Objects/DealSplits/DiscoverySpec.php b/tests/spec/Discovery/Crm/Objects/DealSplits/DiscoverySpec.php
new file mode 100644
index 000000000..af8087484
--- /dev/null
+++ b/tests/spec/Discovery/Crm/Objects/DealSplits/DiscoverySpec.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace spec\HubSpot\Discovery\Crm\Objects\DealSplits;
+
+use GuzzleHttp\Client;
+use HubSpot\Client\Crm\Objects\DealSplits\Api\BatchApi;
+use HubSpot\Config;
+use HubSpot\Discovery\Crm\Objects\DealSplits\Discovery;
+use PhpSpec\ObjectBehavior;
+
+class DiscoverySpec extends ObjectBehavior
+{
+    public function let(Client $client, Config $config)
+    {
+        $this->beConstructedWith($client, $config);
+    }
+
+    public function it_is_initializable()
+    {
+        $this->shouldHaveType(Discovery::class);
+    }
+
+    public function it_creates_clients()
+    {
+        $this->batchApi()->shouldHaveType(BatchApi::class);
+    }
+}
diff --git a/tests/spec/Discovery/Crm/Objects/DiscoverySpec.php b/tests/spec/Discovery/Crm/Objects/DiscoverySpec.php
index 9f2dcf033..2c0b216e9 100644
--- a/tests/spec/Discovery/Crm/Objects/DiscoverySpec.php
+++ b/tests/spec/Discovery/Crm/Objects/DiscoverySpec.php
@@ -9,6 +9,7 @@
 use HubSpot\Config;
 use HubSpot\Discovery\Crm\Objects\Calls\Discovery as CallsDiscovery;
 use HubSpot\Discovery\Crm\Objects\Communications\Discovery as CommunicationsDiscovery;
+use HubSpot\Discovery\Crm\Objects\DealSplits\Discovery as DealSplitsDiscovery;
 use HubSpot\Discovery\Crm\Objects\Discovery;
 use HubSpot\Discovery\Crm\Objects\Emails\Discovery as EmailsDiscovery;
 use HubSpot\Discovery\Crm\Objects\FeedbackSubmissions\Discovery as FeedbackSubmissionsDiscovery;
@@ -39,6 +40,7 @@ public function it_creates_clients()
         $this->batchApi()->shouldHaveType(BatchApi::class);
         $this->calls()->shouldHaveType(CallsDiscovery::class);
         $this->communications()->shouldHaveType(CommunicationsDiscovery::class);
+        $this->dealSplits()->shouldHaveType(DealSplitsDiscovery::class);
         $this->emails()->shouldHaveType(EmailsDiscovery::class);
         $this->feedbackSubmissions()->shouldHaveType(FeedbackSubmissionsDiscovery::class);
         $this->goals()->shouldHaveType(GoalsDiscovery::class);
diff --git a/tests/spec/Discovery/Marketing/DiscoverySpec.php b/tests/spec/Discovery/Marketing/DiscoverySpec.php
index 0e9282efb..95ac2f5e3 100644
--- a/tests/spec/Discovery/Marketing/DiscoverySpec.php
+++ b/tests/spec/Discovery/Marketing/DiscoverySpec.php
@@ -21,6 +21,7 @@ public function it_is_initializable()
 
     public function it_creates_clients()
     {
+        $this->emails()->shouldHaveType(\HubSpot\Discovery\Marketing\Emails\Discovery::class);
         $this->events()->shouldHaveType(\HubSpot\Discovery\Marketing\Events\Discovery::class);
         $this->forms()->shouldHaveType(\HubSpot\Discovery\Marketing\Forms\Discovery::class);
         $this->transactional()->shouldHaveType(\HubSpot\Discovery\Marketing\Transactional\Discovery::class);
diff --git a/tests/spec/Discovery/Marketing/Emails/DiscoverySpec.php b/tests/spec/Discovery/Marketing/Emails/DiscoverySpec.php
new file mode 100644
index 000000000..d8e754a97
--- /dev/null
+++ b/tests/spec/Discovery/Marketing/Emails/DiscoverySpec.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace spec\HubSpot\Discovery\Marketing\Emails;
+
+use GuzzleHttp\Client;
+use HubSpot\Client\Marketing\Emails\Api\MarketingEmailsApi;
+use HubSpot\Client\Marketing\Emails\Api\StatisticsApi;
+use HubSpot\Config;
+use HubSpot\Discovery\Marketing\Emails\Discovery;
+use PhpSpec\ObjectBehavior;
+
+class DiscoverySpec extends ObjectBehavior
+{
+    public function let(Client $client, Config $config)
+    {
+        $this->beConstructedWith($client, $config);
+    }
+
+    public function it_is_initializable()
+    {
+        $this->shouldHaveType(Discovery::class);
+    }
+
+    public function it_creates_clients()
+    {
+        $this->marketingEmailsApi()->shouldHaveType(MarketingEmailsApi::class);
+        $this->statisticsApi()->shouldHaveType(StatisticsApi::class);
+    }
+}