diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php
index 5c6d1628ca1b..3a086b51b1b0 100644
--- a/app/Models/CompanyGateway.php
+++ b/app/Models/CompanyGateway.php
@@ -43,6 +43,7 @@ class CompanyGateway extends BaseModel
         'custom_value2',
         'custom_value3',
         'custom_value4',
+        'token_billing',
     ];
 
     public static $credit_cards = [
diff --git a/app/Models/Document.php b/app/Models/Document.php
index ed62e2bc7584..b0281b95e7ff 100644
--- a/app/Models/Document.php
+++ b/app/Models/Document.php
@@ -26,6 +26,7 @@ class Document extends BaseModel
      */
     protected $fillable = [
         'is_default',
+        'is_public',
     ];
 
 
diff --git a/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php b/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php
index dd221a448ba8..7cc0fbb2606d 100644
--- a/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php
+++ b/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php
@@ -23,7 +23,7 @@ class AddIsPublicToDocumentsTable extends Migration
         });
 
         Schema::table('company_gateways', function (Blueprint $table) {
-            $table->string('token_billing')->default('off');
+            $table->enum('token_billing', ['off', 'always','optin','optout'])->default('off');
         });
     }