diff --git a/src/XeroPHP/Models/Accounting/Account.php b/src/XeroPHP/Models/Accounting/Account.php
index 2f50f270..ea72e5a0 100644
--- a/src/XeroPHP/Models/Accounting/Account.php
+++ b/src/XeroPHP/Models/Accounting/Account.php
@@ -4,9 +4,13 @@
 
 use XeroPHP\Remote;
 
+use XeroPHP\Traits\AttachmentTrait;
+
 
 class Account extends Remote\Object {
 
+    use AttachmentTrait;
+
     /**
      * Customer defined alpha numeric account code e.g 200 or SALES
      *
diff --git a/src/XeroPHP/Models/Accounting/BankTransaction.php b/src/XeroPHP/Models/Accounting/BankTransaction.php
index 0d050006..e8bd9801 100644
--- a/src/XeroPHP/Models/Accounting/BankTransaction.php
+++ b/src/XeroPHP/Models/Accounting/BankTransaction.php
@@ -4,11 +4,15 @@
 
 use XeroPHP\Remote;
 
+use XeroPHP\Traits\AttachmentTrait;
+
 use XeroPHP\Models\Accounting\BankTransaction\LineItem;
 use XeroPHP\Models\Accounting\BankTransaction\BankAccount;
 
 class BankTransaction extends Remote\Object {
 
+    use AttachmentTrait;
+
     /**
      * See Bank Transaction Types
      *
diff --git a/src/XeroPHP/Models/Accounting/BankTransfer.php b/src/XeroPHP/Models/Accounting/BankTransfer.php
index b1ba1419..bd7fb320 100644
--- a/src/XeroPHP/Models/Accounting/BankTransfer.php
+++ b/src/XeroPHP/Models/Accounting/BankTransfer.php
@@ -4,11 +4,15 @@
 
 use XeroPHP\Remote;
 
+use XeroPHP\Traits\AttachmentTrait;
+
 use XeroPHP\Models\Accounting\BankTransfer\FromBankAccount;
 use XeroPHP\Models\Accounting\BankTransfer\ToBankAccount;
 
 class BankTransfer extends Remote\Object {
 
+    use AttachmentTrait;
+
     /**
      * See FromBankAccount
      *
diff --git a/src/XeroPHP/Models/Accounting/Contact.php b/src/XeroPHP/Models/Accounting/Contact.php
index 9c0e9801..ee0efc34 100644
--- a/src/XeroPHP/Models/Accounting/Contact.php
+++ b/src/XeroPHP/Models/Accounting/Contact.php
@@ -4,11 +4,15 @@
 
 use XeroPHP\Remote;
 
+use XeroPHP\Traits\AttachmentTrait;
+
 use XeroPHP\Models\Accounting\Contact\ContactPerson;
 use XeroPHP\Models\Accounting\Organisation\PaymentTerm;
 
 class Contact extends Remote\Object {
 
+    use AttachmentTrait;
+
     /**
      * Xero identifier
      *
diff --git a/src/XeroPHP/Models/Accounting/CreditNote.php b/src/XeroPHP/Models/Accounting/CreditNote.php
index 48baf47c..fb7c9f3a 100644
--- a/src/XeroPHP/Models/Accounting/CreditNote.php
+++ b/src/XeroPHP/Models/Accounting/CreditNote.php
@@ -4,11 +4,17 @@
 
 use XeroPHP\Remote;
 
+use XeroPHP\Traits\PDFTrait;
+use XeroPHP\Traits\AttachmentTrait;
+
 use XeroPHP\Models\Accounting\Invoice\LineItem;
 use XeroPHP\Models\Accounting\CreditNote\Allocation;
 
 class CreditNote extends Remote\Object {
 
+    use PDFTrait;
+    use AttachmentTrait;
+
     /**
      * An optional field to store a reference
      *
diff --git a/src/XeroPHP/Models/Accounting/Invoice.php b/src/XeroPHP/Models/Accounting/Invoice.php
index 13c3dbce..905df893 100644
--- a/src/XeroPHP/Models/Accounting/Invoice.php
+++ b/src/XeroPHP/Models/Accounting/Invoice.php
@@ -4,10 +4,16 @@
 
 use XeroPHP\Remote;
 
+use XeroPHP\Traits\PDFTrait;
+use XeroPHP\Traits\AttachmentTrait;
+
 use XeroPHP\Models\Accounting\Invoice\LineItem;
 
 class Invoice extends Remote\Object {
 
+    use PDFTrait;
+    use AttachmentTrait;
+
     /**
      * See Invoice Types
      *
diff --git a/src/XeroPHP/Models/Accounting/ManualJournal.php b/src/XeroPHP/Models/Accounting/ManualJournal.php
index b054cc12..895f7970 100644
--- a/src/XeroPHP/Models/Accounting/ManualJournal.php
+++ b/src/XeroPHP/Models/Accounting/ManualJournal.php
@@ -4,10 +4,14 @@
 
 use XeroPHP\Remote;
 
+use XeroPHP\Traits\AttachmentTrait;
+
 use XeroPHP\Models\Accounting\ManualJournal\JournalLine;
 
 class ManualJournal extends Remote\Object {
 
+    use AttachmentTrait;
+
     /**
      * Xero identifier
      *
diff --git a/src/XeroPHP/Models/Accounting/Overpayment.php b/src/XeroPHP/Models/Accounting/Overpayment.php
index 3916d321..fc8bdad5 100644
--- a/src/XeroPHP/Models/Accounting/Overpayment.php
+++ b/src/XeroPHP/Models/Accounting/Overpayment.php
@@ -4,11 +4,15 @@
 
 use XeroPHP\Remote;
 
+use XeroPHP\Traits\AttachmentTrait;
+
 use XeroPHP\Models\Accounting\BankTransaction\LineItem;
 use XeroPHP\Models\Accounting\Overpayment\Allocation;
 
 class Overpayment extends Remote\Object {
 
+    use AttachmentTrait;
+
     /**
      * This property has been removed from the Xero API
      *
diff --git a/src/XeroPHP/Models/Accounting/Prepayment.php b/src/XeroPHP/Models/Accounting/Prepayment.php
index 425b6aa9..a3c5094f 100644
--- a/src/XeroPHP/Models/Accounting/Prepayment.php
+++ b/src/XeroPHP/Models/Accounting/Prepayment.php
@@ -4,11 +4,15 @@
 
 use XeroPHP\Remote;
 
+use XeroPHP\Traits\AttachmentTrait;
+
 use XeroPHP\Models\Accounting\BankTransaction\LineItem;
 use XeroPHP\Models\Accounting\Prepayment\Allocation;
 
 class Prepayment extends Remote\Object {
 
+    use AttachmentTrait;
+
     /**
      * This property has been removed from the Xero API
      *
diff --git a/src/XeroPHP/Models/Accounting/Receipt.php b/src/XeroPHP/Models/Accounting/Receipt.php
index 88676193..97541740 100644
--- a/src/XeroPHP/Models/Accounting/Receipt.php
+++ b/src/XeroPHP/Models/Accounting/Receipt.php
@@ -4,10 +4,14 @@
 
 use XeroPHP\Remote;
 
+use XeroPHP\Traits\AttachmentTrait;
+
 use XeroPHP\Models\Accounting\Receipt\LineItem;
 
 class Receipt extends Remote\Object {
 
+    use AttachmentTrait;
+
     /**
      * Date of receipt – YYYY-MM-DD
      *
diff --git a/src/XeroPHP/Models/Accounting/RepeatingInvoice.php b/src/XeroPHP/Models/Accounting/RepeatingInvoice.php
index d7d0aa77..f417c750 100644
--- a/src/XeroPHP/Models/Accounting/RepeatingInvoice.php
+++ b/src/XeroPHP/Models/Accounting/RepeatingInvoice.php
@@ -4,11 +4,15 @@
 
 use XeroPHP\Remote;
 
+use XeroPHP\Traits\AttachmentTrait;
+
 use XeroPHP\Models\Accounting\RepeatingInvoice\Schedule;
 use XeroPHP\Models\Accounting\RepeatingInvoice\LineItem;
 
 class RepeatingInvoice extends Remote\Object {
 
+    use AttachmentTrait;
+
     /**
      * See Invoice Types
      *