diff --git a/app/Ninja/Transformers/AccountTransformer.php b/app/Ninja/Transformers/AccountTransformer.php
index 9f7eca1f7eca..36ba2fffcbf4 100644
--- a/app/Ninja/Transformers/AccountTransformer.php
+++ b/app/Ninja/Transformers/AccountTransformer.php
@@ -4,6 +4,7 @@ use App\Models\Account;
 use App\Models\AccountToken;
 use App\Models\Contact;
 use App\Models\Product;
+use App\Models\TaxRate;
 use League\Fractal;
 use League\Fractal\TransformerAbstract;
 
@@ -11,10 +12,11 @@ class AccountTransformer extends EntityTransformer
 {
     protected $defaultIncludes = [
         'users',
-        'clients',
+    //    'clients',
         'invoices',
         'contacts',
         'products',
+        'taxRates'
     ];
 
     public function includeUsers(Account $account)
@@ -47,6 +49,13 @@ class AccountTransformer extends EntityTransformer
         return $this->includeCollection($account->products, $transformer, 'products');
     }
 
+    public function includeTaxRates(Account $account)
+    {
+        $transformer = new TaxRateTransformer($account, $this->serializer);
+        return $this->includeCollection($account->tax_rates, $transformer, 'taxRates');
+    }
+
+
     public function transform(Account $account)
     {
         return [
diff --git a/app/Ninja/Transformers/ClientTransformer.php b/app/Ninja/Transformers/ClientTransformer.php
index 8423786fd7d4..9b12cf9e05ae 100644
--- a/app/Ninja/Transformers/ClientTransformer.php
+++ b/app/Ninja/Transformers/ClientTransformer.php
@@ -91,7 +91,8 @@ class ClientTransformer extends EntityTransformer
             'payment_terms' => (int) $client->payment_terms,
             'vat_number' => $client->vat_number,
             'id_number' => $client->id_number,
-            'language_id' => (int) $client->language_id
+            'language_id' => (int) $client->language_id,
+            'currency_id' => (int) $client->currency_id
         ];
     }
 }
\ No newline at end of file
diff --git a/app/Ninja/Transformers/ContactTransformer.php b/app/Ninja/Transformers/ContactTransformer.php
index 51114da5aee4..64713ef17f27 100644
--- a/app/Ninja/Transformers/ContactTransformer.php
+++ b/app/Ninja/Transformers/ContactTransformer.php
@@ -13,7 +13,6 @@ class ContactTransformer extends EntityTransformer
             'first_name' => $contact->first_name,
             'last_name' => $contact->last_name,
             'email' => $contact->email,
-            'user_id' => (int) $contact->user_id,
             'updated_at' => $contact->updated_at,
             'deleted_at' => $contact->deleted_at,
             'is_primary' => (bool) $contact->is_primary,
diff --git a/app/Ninja/Transformers/InvoiceItemTransformer.php b/app/Ninja/Transformers/InvoiceItemTransformer.php
index bcc86301e7ef..7de8033f8393 100644
--- a/app/Ninja/Transformers/InvoiceItemTransformer.php
+++ b/app/Ninja/Transformers/InvoiceItemTransformer.php
@@ -13,8 +13,6 @@ class InvoiceItemTransformer extends EntityTransformer
             'product_key' => $item->product_key,
             'account_key' => $this->account->account_key,
             'user_id' => (int) $item->user_id,
-            'invoice_id' => (int) $item->invoice->public_id,
-            'product_id' => (int) $item->product->public_id,
             'updated_at' => $item->updated_at,
             'deleted_at' => $item->deleted_at,
             'product_key' => $item->product_key,
diff --git a/app/Ninja/Transformers/TaxRateTransformer.php b/app/Ninja/Transformers/TaxRateTransformer.php
new file mode 100644
index 000000000000..a7aa05459eb4
--- /dev/null
+++ b/app/Ninja/Transformers/TaxRateTransformer.php
@@ -0,0 +1,33 @@
+<?php namespace App\Ninja\Transformers;
+
+use App\Models\Account;
+use App\Models\TaxRate;
+use League\Fractal;
+
+/**
+ * @SWG\Definition(definition="TaxRate", @SWG\Xml(name="TaxRate"))
+ */
+
+class TaxRateTransformer extends EntityTransformer
+{
+        /**
+         * @SWG\Property(property="id", type="integer", example=1, readOnly=true)
+         * @SWG\Property(property="name", type="string", example="GST")
+         * @SWG\Property(property="account_key", type="string", example="34erfdf33fdff" readOnly=true)
+         * @SWG\Property(property="rate", type="float", example=17.5)
+         * @SWG\Property(property="updated_at", type="date-time", example="2016-01-01 12:10:00")
+         * @SWG\Property(property="archived_at", type="date-time", example="2016-01-01 12:10:00")
+         */
+
+    public function transform(TaxRate $taxRate)
+    {
+        return [
+            'id' => (int) $taxRate->public_id,
+            'name' => $taxRate->name,
+            'rate' => (float) $taxRate->rate,
+            'updated_at' => $taxRate->updated_at,
+            'archived_at' => $taxRate->deleted_at,
+            'account_key' => $this->account->account_key,
+            ];
+    }
+}
\ No newline at end of file