diff --git a/includes/WdEntityWrapper.php b/includes/WdEntityWrapper.php
index 29f8044..d24a960 100644
--- a/includes/WdEntityWrapper.php
+++ b/includes/WdEntityWrapper.php
@@ -29,12 +29,11 @@ class WdEntityWrapper {
    * @param stdClass|int $entity
    *   Entity to wrap. Will load entity if ID is passed.
    */
-  public function __construct($entity_type, $entity) {
+  public function __construct($entity) {
     if (is_numeric($entity)) {
-      $entity = entity_load_single($entity_type, $entity);
+      $entity = entity_load_single($this->entity_type, $entity);
     }
-    $this->entity = entity_metadata_wrapper($entity_type, $entity);
-    $this->entity_type = $entity_type;
+    $this->entity = entity_metadata_wrapper($this->entity_type, $entity);
   }
 
   /**
diff --git a/includes/WdNodeWrapper.php b/includes/WdNodeWrapper.php
index 73fda5d..9edf447 100644
--- a/includes/WdNodeWrapper.php
+++ b/includes/WdNodeWrapper.php
@@ -9,18 +9,7 @@
  * Class WdNodeWrapper
  */
 class WdNodeWrapper extends WdEntityWrapper {
-
-  /**
-   * Wrap a node.
-   *
-   * @param stdClass|int $node
-   */
-  public function __construct($node) {
-    if (is_numeric($node)) {
-      $node = node_load($node);
-    }
-    parent::__construct('node', $node);
-  }
+  protected $entity_type = 'node';
 
   /**
    * Create a new node.
diff --git a/includes/WdUserWrapper.php b/includes/WdUserWrapper.php
index a27e5e3..a3c3219 100644
--- a/includes/WdUserWrapper.php
+++ b/includes/WdUserWrapper.php
@@ -5,19 +5,7 @@
  */
 
 class WdUserWrapper extends WdEntityWrapper {
-
-
-  /**
-   * Wrap a user object.
-   *
-   * @param stdClass|int $account
-   */
-  public function __construct($account) {
-    if (is_numeric($account)) {
-      $account = user_load($account);
-    }
-    parent::__construct('user', $account);
-  }
+  protected $entity_type = 'user';
 
   /**
    * Create a user.
diff --git a/modules/wrappers_delight_commerce/includes/WdCommerceLineItemWrapper.php b/modules/wrappers_delight_commerce/includes/WdCommerceLineItemWrapper.php
index fd1fa83..3bd6169 100644
--- a/modules/wrappers_delight_commerce/includes/WdCommerceLineItemWrapper.php
+++ b/modules/wrappers_delight_commerce/includes/WdCommerceLineItemWrapper.php
@@ -5,18 +5,7 @@
  */
 
 class WdCommerceLineItemWrapper extends WdEntityWrapper {
-
-  /**
-   * Wrap a Commerce Line Item.
-   *
-   * @param stdClass|int $line_item
-   */
-  public function __construct($line_item) {
-    if (is_numeric($line_item)) {
-      $line_item = commerce_line_item_load($line_item);
-    }
-    parent::__construct('commerce_line_item', $line_item);
-  }
+  protected $entity_type = 'commerce_line_item';
 
   /**
    * Retrieves the commerce product on this line item.
diff --git a/modules/wrappers_delight_commerce/includes/WdCommerceOrderWrapper.php b/modules/wrappers_delight_commerce/includes/WdCommerceOrderWrapper.php
index 04710d4..4c88d7c 100644
--- a/modules/wrappers_delight_commerce/includes/WdCommerceOrderWrapper.php
+++ b/modules/wrappers_delight_commerce/includes/WdCommerceOrderWrapper.php
@@ -5,18 +5,7 @@
  */
 
 class WdCommerceOrderWrapper extends WdEntityWrapper {
-
-  /**
-   * Wrap a Commerce Order
-   *
-   * @param stdClass|int $order
-   */
-  public function __construct($order) {
-    if (is_numeric($order)) {
-      $order = commerce_order_load($order);
-    }
-    parent::__construct('commerce_order', $order);
-  }
+  protected $entity_type = 'commerce_order';
 
   /**
    * Retrieve the commerce line items.
diff --git a/modules/wrappers_delight_commerce/includes/WdCommerceProductWrapper.php b/modules/wrappers_delight_commerce/includes/WdCommerceProductWrapper.php
index 2d7d13a..eea05e7 100644
--- a/modules/wrappers_delight_commerce/includes/WdCommerceProductWrapper.php
+++ b/modules/wrappers_delight_commerce/includes/WdCommerceProductWrapper.php
@@ -5,18 +5,7 @@
  * WdCommerceProductWrapper
  */
 class WdCommerceProductWrapper extends WdEntityWrapper {
-
-  /**
-   * Wrap a Commerce Product
-   *
-   * @param stdClass|int $product
-   */
-  public function __construct($product) {
-    if (is_numeric($product)) {
-      $product = commerce_product_load($product);
-    }
-    parent::__construct('commerce_product', $product);
-  }
+  protected $entity_type = 'commerce_product';
 
   /**
    * Create a Commerce Product
diff --git a/modules/wrappers_delight_message/includes/WdMessageWrapper.php b/modules/wrappers_delight_message/includes/WdMessageWrapper.php
index 3c9c939..8ea5464 100644
--- a/modules/wrappers_delight_message/includes/WdMessageWrapper.php
+++ b/modules/wrappers_delight_message/includes/WdMessageWrapper.php
@@ -5,18 +5,7 @@
  */
 
 class WdMessageWrapper extends WdEntityWrapper {
-
-  /**
-   * Wrap a Message entity.
-   *
-   * @param stdClass|int $message
-   */
-  public function __construct($message) {
-    if (is_numeric($message)) {
-      $message = message_load($message);
-    }
-    parent::__construct('message', $message);
-  }
+  protected $entity_type = 'message';
 
   /**
    * Create a Message entity
diff --git a/modules/wrappers_delight_og/includes/WdOgMembershipWrapper.php b/modules/wrappers_delight_og/includes/WdOgMembershipWrapper.php
index 0b65e05..684940b 100644
--- a/modules/wrappers_delight_og/includes/WdOgMembershipWrapper.php
+++ b/modules/wrappers_delight_og/includes/WdOgMembershipWrapper.php
@@ -5,18 +5,7 @@
  * WdOgMembershipWrapper
  */
 class WdOgMembershipWrapper extends WdEntityWrapper {
-
-  /**
-   * Wrap an OG Membership entity.
-   *
-   * @param stdClass|int $membership
-   */
-  public function __construct($membership) {
-    if (is_numeric($membership)) {
-      $membership = og_membership_load($membership);
-    }
-    parent::__construct('og_membership', $membership);
-  }
+  protected $entity_type = 'og_membership';
 
   /**
    * Create an OG Membership entity.
diff --git a/templates/wrappers_custom.php.txt b/templates/wrappers_custom.php.txt
index 7b27703..86b0484 100644
--- a/templates/wrappers_custom.php.txt
+++ b/templates/wrappers_custom.php.txt
@@ -5,7 +5,7 @@
  */
 
 class {{ class_name }} extends {{ parent_class }} {
-
+  protected $entity_type = '{{ entity_type }}';
   private static $bundle = '{{ bundle }}';
 
   /**