diff --git a/src/Generator/Generator.php b/src/Generator/Generator.php
index c6362e8..39418ef 100644
--- a/src/Generator/Generator.php
+++ b/src/Generator/Generator.php
@@ -74,7 +74,7 @@ protected function configure() {
     /**
      * Called by Command
      */
-    protected function execute(InputInterface $input, OutputInterface $output) {
+    protected function execute($input, $output) {
         $this->_gatherPaths();
         $this->_formatDefinitions();
         $this->_generateModels();
@@ -112,28 +112,19 @@ private function _generateModels() {
         }
 
         foreach ($this->_definitions as $definition) {
-            $dir = $modelDir . $definition->namespace . '/';
-            $baseDir = $modelDir . '_Base/' . $definition->namespace . '/';
-            $baseFile = 'Base' . $definition->name . '.php';
+
+            //Model files
+            $filePath = $definition->namespace . '/';
+            $dir = $modelDir . $filePath;
             $file = $definition->name . '.php';
-            $basePath = $baseDir . $baseFile;
             $path = $dir . $file;
 
-            if (!is_dir($dir)) {
-                mkdir($dir, 0777, true);
-            }
-
-            if (!is_dir($baseDir)) {
-                mkdir($baseDir, 0777, true);
-            }
+            //Base model files
+            $baseFilePath = '_Base/' . $definition->namespace . '/';
+            $baseDir = $modelDir . $baseFilePath;
+            $baseFile = 'Base' . $definition->name . '.php';
+            $basePath = $baseDir . $baseFile;
 
-            if (file_exists($path)) {
-                unlink($path);
-            }
-
-            if (file_exists($basePath)) {
-                unlink($basePath);
-            }
 
             if (in_array(strtolower($definition->name), $this->_paths)) {
                 //ApiModel
@@ -148,8 +139,34 @@ private function _generateModels() {
                 $content = $this->_mustache->render($model, $definition->getArray());
                 $baseContent = $this->_mustache->render($baseModel, $definition->getArray());
             }
-            file_put_contents($path, $content);
-            file_put_contents($basePath, $baseContent);
+
+            $currentFile = null;
+            @$currentFile = file_get_contents(realpath(dirname(__FILE__) . '/../Models') . '/' . $filePath . $file);
+
+            $currentBaseFile = null;
+            @$currentBaseFile = file_get_contents(realpath(dirname(__FILE__) . '/../Models') . '/' . $baseFilePath . $baseFile);
+
+            if ($content !== $currentFile) {
+                if (!is_dir($dir)) {
+                    mkdir($dir, 0777, true);
+                }
+
+                if (file_exists($path)) {
+                    unlink($path);
+                }
+
+                file_put_contents($path, $content);
+            }
+
+            if ($baseContent !== $currentBaseFile) {
+                if (!is_dir($baseDir)) {
+                    mkdir($baseDir, 0777, true);
+                }
+                if (file_exists($basePath)) {
+                    unlink($basePath);
+                }
+                file_put_contents($basePath, $baseContent);
+            }
         }
     }
 
diff --git a/src/Models/Coupons/Coupon.php b/src/Models/Coupons/Coupon.php
new file mode 100644
index 0000000..f02d2b5
--- /dev/null
+++ b/src/Models/Coupons/Coupon.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Afosto\ApiClient\Models\Coupons;
+
+use Afosto\ApiClient\Models\_Base\Coupons\BaseCoupon;
+
+/**
+ * Use this class for custom methods that extend the default functionality for 
+ * the Coupon
+ * 
+ * This class can interact with api, through methods like find and save.
+ */
+class Coupon extends BaseCoupon {
+    
+}
\ No newline at end of file
diff --git a/src/Models/Coupons/CouponRel.php b/src/Models/Coupons/CouponRel.php
new file mode 100644
index 0000000..5591b94
--- /dev/null
+++ b/src/Models/Coupons/CouponRel.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Afosto\ApiClient\Models\Coupons;
+
+use Afosto\ApiClient\Models\_Base\Coupons\BaseCouponRel;
+
+/**
+ * Use this class for custom methods that extend the default functionality for 
+ * the CouponRel
+ * 
+ * This class acts as a relation handler and makes it possible to traverse 
+ * between objects
+ */
+class CouponRel extends BaseCouponRel {
+    
+}
\ No newline at end of file
diff --git a/src/Models/Images/Image.php b/src/Models/Images/Image.php
index 23e9129..039b864 100644
--- a/src/Models/Images/Image.php
+++ b/src/Models/Images/Image.php
@@ -5,11 +5,10 @@
 use Afosto\ApiClient\Models\_Base\Images\BaseImage;
 
 /**
- * Use this class for custom methods that extend the default functionality for 
+ * Use this class for custom methods that extend the default functionality for
  * the Image
- * 
- * This object cannot be called directly from the api and has therefore no api
- * operations. It is only used to format and maintain the data.
+ *
+ * This class can interact with api, through methods like find and save.
  */
 class Image extends BaseImage {
 
diff --git a/src/Models/InternalShipmentItems/InternalShipmentItem.php b/src/Models/InternalShipmentItems/InternalShipmentItem.php
new file mode 100644
index 0000000..1c4cf5f
--- /dev/null
+++ b/src/Models/InternalShipmentItems/InternalShipmentItem.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Afosto\ApiClient\Models\InternalShipmentItems;
+
+use Afosto\ApiClient\Models\_Base\InternalShipmentItems\BaseInternalShipmentItem;
+
+/**
+ * Use this class for custom methods that extend the default functionality for 
+ * the InternalShipmentItem
+ * 
+ * This object cannot be called directly from the api and has therefore no api
+ * operations. It is only used to format and maintain the data.
+ */
+class InternalShipmentItem extends BaseInternalShipmentItem {
+
+}
\ No newline at end of file
diff --git a/src/Models/InternalShipments/InternalShipment.php b/src/Models/InternalShipments/InternalShipment.php
new file mode 100644
index 0000000..147e9f9
--- /dev/null
+++ b/src/Models/InternalShipments/InternalShipment.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Afosto\ApiClient\Models\InternalShipments;
+
+use Afosto\ApiClient\Models\_Base\InternalShipments\BaseInternalShipment;
+
+/**
+ * Use this class for custom methods that extend the default functionality for 
+ * the InternalShipment
+ * 
+ * This object cannot be called directly from the api and has therefore no api
+ * operations. It is only used to format and maintain the data.
+ */
+class InternalShipment extends BaseInternalShipment {
+
+}
\ No newline at end of file
diff --git a/src/Models/MetaGroups/MetaGroup.php b/src/Models/MetaGroups/MetaGroup.php
index 51f625c..e317a06 100644
--- a/src/Models/MetaGroups/MetaGroup.php
+++ b/src/Models/MetaGroups/MetaGroup.php
@@ -5,11 +5,10 @@
 use Afosto\ApiClient\Models\_Base\MetaGroups\BaseMetaGroup;
 
 /**
- * Use this class for custom methods that extend the default functionality for 
+ * Use this class for custom methods that extend the default functionality for
  * the MetaGroup
- * 
- * This object cannot be called directly from the api and has therefore no api
- * operations. It is only used to format and maintain the data.
+ *
+ * This class can interact with api, through methods like find and save.
  */
 class MetaGroup extends BaseMetaGroup {
 
diff --git a/src/Models/PriceGroups/PriceGroup.php b/src/Models/PriceGroups/PriceGroup.php
index 586f477..c51c199 100644
--- a/src/Models/PriceGroups/PriceGroup.php
+++ b/src/Models/PriceGroups/PriceGroup.php
@@ -8,9 +8,8 @@
  * Use this class for custom methods that extend the default functionality for 
  * the PriceGroup
  * 
- * This object cannot be called directly from the api and has therefore no api
- * operations. It is only used to format and maintain the data.
+ * This class can interact with api, through methods like find and save.
  */
 class PriceGroup extends BasePriceGroup {
-
+    
 }
\ No newline at end of file
diff --git a/src/Models/_Base/Coupons/BaseCoupon.php b/src/Models/_Base/Coupons/BaseCoupon.php
new file mode 100644
index 0000000..88264d7
--- /dev/null
+++ b/src/Models/_Base/Coupons/BaseCoupon.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace Afosto\ApiClient\Models\_Base\Coupons;
+
+use Afosto\ApiClient\Components\Models\Model;
+use Afosto\ApiClient\Components\ModelTrait;
+
+/**
+ * NOTE: Do not overwrite this model, as it is the base class and auto-generated 
+ * by the generator in the dev folder, based on the SwaggerJSON for the Afosto 
+ * API V2 (https://api.afosto.com/v2).
+ * 
+ * @category Class
+ * @package  Afosto\ApiClient
+ * @author   https://afosto.com
+ * 
+ * Copyright 2016 Afosto SaaS BV
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * @property integer $id
+ * @property boolean $is_unlimited
+ * @property integer $exchange_rate
+ * @property number $exchange_value
+ * @property integer $available
+ * @property integer $used
+ * @property string $expires_at
+ * @property string $code
+ * @property integer $label
+ * 
+ * @property \Afosto\ApiClient\Models\Customers\Customer $customer
+**/
+class BaseCoupon extends Model {
+
+    use ModelTrait;
+
+    /**
+     * Array of attributes where the key is the local name, and the value is the original name
+     * @return array 
+     */
+    public function getAttributes() {
+        return [
+            'id',
+            'is_unlimited',
+            'exchange_rate',
+            'exchange_value',
+            'available',
+            'used',
+            'expires_at',
+            'code',
+            'label',
+        ];
+    }
+    
+    /**
+     * Array with relations
+     * @return array
+     */
+    public function getRelations() {
+        return [
+            'customer' => ['CustomerRel', 'one'],
+        ];
+    }
+
+    /**
+     * Array with types, rules
+     * @return array
+     */
+    public function getTypes() {
+        return [
+            ['id, code, ','required'],
+            ['id, exchange_rate, available, used, label','integer'],
+            ['is_unlimited','boolean'],
+            ['exchange_value','number'],
+            ['expires_at, code','string'],
+        ];
+    }
+
+    /**
+     * Map model data
+     * @return array
+     */
+    protected function getMapping() {
+        return array_merge([], parent::getMapping());
+    }
+}
\ No newline at end of file
diff --git a/src/Models/_Base/Coupons/BaseCouponRel.php b/src/Models/_Base/Coupons/BaseCouponRel.php
new file mode 100644
index 0000000..0edf500
--- /dev/null
+++ b/src/Models/_Base/Coupons/BaseCouponRel.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Afosto\ApiClient\Models\_Base\Coupons;
+
+use Afosto\ApiClient\Components\Models\Link;
+use Afosto\ApiClient\Models\Coupons\Coupon;
+
+/**
+ * NOTE: Do not overwrite this model, as it is the base class and auto-generated 
+ * by the generator in the dev folder, based on the SwaggerJSON for the Afosto 
+ * API V2 (https://api.afosto.com/v2).
+ * 
+ * @category Class
+ * @package  Afosto\ApiClient
+ * @author   https://afosto.com
+ * 
+ * Copyright 2016 Afosto SaaS BV
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+class BaseCouponRel extends Link {
+    
+    /**
+     * @return Coupon
+     */
+    public function getModel() {
+        return new Coupon();
+    }
+}
\ No newline at end of file
diff --git a/src/Models/_Base/InternalShipmentItems/BaseInternalShipmentItem.php b/src/Models/_Base/InternalShipmentItems/BaseInternalShipmentItem.php
new file mode 100644
index 0000000..c053dde
--- /dev/null
+++ b/src/Models/_Base/InternalShipmentItems/BaseInternalShipmentItem.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Afosto\ApiClient\Models\_Base\InternalShipmentItems;
+
+use Afosto\ApiClient\Components\Models\Model;
+
+/**
+ * NOTE: Do not overwrite this model, as it is the base class and auto-generated 
+ * by the generator in the dev folder, based on the SwaggerJSON for the Afosto 
+ * API V2 (https://api.afosto.com/v2).
+ * 
+ * @category Class
+ * @package  Afosto\ApiClient
+ * @author   https://afosto.com
+ * 
+ * Copyright 2016 Afosto SaaS BV
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * @property integer $id
+ * @property integer $amount
+ *
+ * @property \Afosto\ApiClient\Models\Products\Product $product
+**/
+class BaseInternalShipmentItem extends Model {
+
+    /**
+     * Array of attributes where the key is the local name, and the value is the original name
+     * @return array 
+     */
+    public function getAttributes() {
+        return [
+            'id',
+            'amount',
+        ];
+    }
+    
+    /**
+     * Array with relations
+     * @return array
+     */
+    public function getRelations() {
+        return [
+            'product' => ['ProductRel', 'one'],
+        ];
+    }
+
+    /**
+     * Array with types, rules
+     * @return array
+     */
+    public function getTypes() {
+        return [
+            ['id, amount, product','required'],
+            ['id, amount','integer'],
+        ];
+    }
+
+    /**
+     * Map model data
+     * @return array
+     */
+    protected function getMapping() {
+        return array_merge([], parent::getMapping());
+    }
+}
\ No newline at end of file
diff --git a/src/Models/_Base/InternalShipments/BaseInternalShipment.php b/src/Models/_Base/InternalShipments/BaseInternalShipment.php
new file mode 100644
index 0000000..7a5e88c
--- /dev/null
+++ b/src/Models/_Base/InternalShipments/BaseInternalShipment.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Afosto\ApiClient\Models\_Base\InternalShipments;
+
+use Afosto\ApiClient\Components\Models\Model;
+
+/**
+ * NOTE: Do not overwrite this model, as it is the base class and auto-generated 
+ * by the generator in the dev folder, based on the SwaggerJSON for the Afosto 
+ * API V2 (https://api.afosto.com/v2).
+ * 
+ * @category Class
+ * @package  Afosto\ApiClient
+ * @author   https://afosto.com
+ * 
+ * Copyright 2016 Afosto SaaS BV
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * @property integer $id
+ * @property string $started_at
+ * @property string $expected_at
+ *
+ * @property \Afosto\ApiClient\Models\Warehouses\Warehouse $source
+ * @property \Afosto\ApiClient\Models\Warehouses\Warehouse $mediator
+ * @property \Afosto\ApiClient\Models\Warehouses\Warehouse $target
+ * @property \Afosto\ApiClient\Models\Customers\Customer $customer
+ * @property \Afosto\ApiClient\Models\InternalShipmentItems\InternalShipmentItem[] $items
+**/
+class BaseInternalShipment extends Model {
+
+    /**
+     * Array of attributes where the key is the local name, and the value is the original name
+     * @return array 
+     */
+    public function getAttributes() {
+        return [
+            'id',
+            'started_at',
+            'expected_at',
+        ];
+    }
+    
+    /**
+     * Array with relations
+     * @return array
+     */
+    public function getRelations() {
+        return [
+            'source' => ['WarehouseRel', 'one'],
+            'mediator' => ['WarehouseRel', 'one'],
+            'target' => ['WarehouseRel', 'one'],
+            'customer' => ['CustomerRel', 'one'],
+            'items' => ['InternalShipmentItem', 'many'],
+        ];
+    }
+
+    /**
+     * Array with types, rules
+     * @return array
+     */
+    public function getTypes() {
+        return [
+            ['id, source, mediator, target, ','required'],
+            ['id','integer'],
+            ['started_at, expected_at','string'],
+        ];
+    }
+
+    /**
+     * Map model data
+     * @return array
+     */
+    protected function getMapping() {
+        return array_merge([], parent::getMapping());
+    }
+}
\ No newline at end of file
diff --git a/src/Models/_Base/Products/BaseItem.php b/src/Models/_Base/Products/BaseItem.php
index e77bcdf..823ec7e 100644
--- a/src/Models/_Base/Products/BaseItem.php
+++ b/src/Models/_Base/Products/BaseItem.php
@@ -30,6 +30,7 @@
  * @property integer $id
  * @property string $ean
  * @property string $sku
+ * @property string $suffix
  * @property string $created_at
  * @property string $updated_at
  *
@@ -48,6 +49,7 @@ public function getAttributes() {
             'id',
             'ean',
             'sku',
+            'suffix',
             'created_at',
             'updated_at',
         ];
@@ -73,7 +75,7 @@ public function getTypes() {
         return [
             ['ean, created_at, updated_at, inventory, prices, options, ','required'],
             ['id','integer'],
-            ['ean, sku, created_at, updated_at','string'],
+            ['ean, sku, suffix, created_at, updated_at','string'],
         ];
     }