diff --git a/lib/data/models/invoice_model.dart b/lib/data/models/invoice_model.dart
index 036e2214b..1ff7a4f8c 100644
--- a/lib/data/models/invoice_model.dart
+++ b/lib/data/models/invoice_model.dart
@@ -236,18 +236,9 @@ abstract class InvoiceEntity extends Object
   bool get usesInclusiveTaxes;
 
   /*
-  @BuiltValueField(wireName: 'frequency_id')
-  int get frequencyId;
-
-  @BuiltValueField(wireName: 'start_date')
-  String get startDate;
-
   @BuiltValueField(wireName: 'end_date')
   String get endDate;
 
-  @BuiltValueField(wireName: 'last_sent_date')
-  String get lastSentDate;
-
   @BuiltValueField(wireName: 'recurring_invoice_id')
   String get recurringInvoiceId;
   */
@@ -346,20 +337,42 @@ abstract class InvoiceEntity extends Object
   @BuiltValueField(wireName: 'has_expenses')
   bool get hasExpenses;
 
+  @BuiltValueField(wireName: 'exchange_rate')
+  double get exchangeRate;
+
+  @nullable
   @BuiltValueField(wireName: 'reminder1_sent')
   String get reminder1Sent;
 
+  @nullable
   @BuiltValueField(wireName: 'reminder2_sent')
   String get reminder2Sent;
 
+  @nullable
   @BuiltValueField(wireName: 'reminder3_sent')
   String get reminder3Sent;
 
+  @nullable
   @BuiltValueField(wireName: 'reminder_last_sent')
   String get reminderLastSent;
 
-  @BuiltValueField(wireName: 'exchange_rate')
-  double get exchangeRate;
+  @nullable
+  @BuiltValueField(wireName: 'frequency_id')
+  String get frequencyId;
+
+  @BuiltValueField(wireName: 'last_sent_date')
+  String get lastSentDate;
+
+  @BuiltValueField(wireName: 'next_send_date')
+  String get nextSendDate;
+
+  @nullable
+  @BuiltValueField(wireName: 'start_date')
+  String get startDate;
+
+  @nullable
+  @BuiltValueField(wireName: 'remaining_cycles')
+  int get remainingCycles;
 
   @nullable
   @BuiltValueField(wireName: 'invoice_id')
diff --git a/lib/data/models/invoice_model.g.dart b/lib/data/models/invoice_model.g.dart
index 16c5ac7f1..92d2dcf4b 100644
--- a/lib/data/models/invoice_model.g.dart
+++ b/lib/data/models/invoice_model.g.dart
@@ -228,21 +228,15 @@ class _$InvoiceEntitySerializer implements StructuredSerializer<InvoiceEntity> {
       'has_expenses',
       serializers.serialize(object.hasExpenses,
           specifiedType: const FullType(bool)),
-      'reminder1_sent',
-      serializers.serialize(object.reminder1Sent,
-          specifiedType: const FullType(String)),
-      'reminder2_sent',
-      serializers.serialize(object.reminder2Sent,
-          specifiedType: const FullType(String)),
-      'reminder3_sent',
-      serializers.serialize(object.reminder3Sent,
-          specifiedType: const FullType(String)),
-      'reminder_last_sent',
-      serializers.serialize(object.reminderLastSent,
-          specifiedType: const FullType(String)),
       'exchange_rate',
       serializers.serialize(object.exchangeRate,
           specifiedType: const FullType(double)),
+      'last_sent_date',
+      serializers.serialize(object.lastSentDate,
+          specifiedType: const FullType(String)),
+      'next_send_date',
+      serializers.serialize(object.nextSendDate,
+          specifiedType: const FullType(String)),
       'line_items',
       serializers.serialize(object.lineItems,
           specifiedType: const FullType(
@@ -297,6 +291,48 @@ class _$InvoiceEntitySerializer implements StructuredSerializer<InvoiceEntity> {
         ..add(serializers.serialize(object.customTaxes4,
             specifiedType: const FullType(bool)));
     }
+    if (object.reminder1Sent != null) {
+      result
+        ..add('reminder1_sent')
+        ..add(serializers.serialize(object.reminder1Sent,
+            specifiedType: const FullType(String)));
+    }
+    if (object.reminder2Sent != null) {
+      result
+        ..add('reminder2_sent')
+        ..add(serializers.serialize(object.reminder2Sent,
+            specifiedType: const FullType(String)));
+    }
+    if (object.reminder3Sent != null) {
+      result
+        ..add('reminder3_sent')
+        ..add(serializers.serialize(object.reminder3Sent,
+            specifiedType: const FullType(String)));
+    }
+    if (object.reminderLastSent != null) {
+      result
+        ..add('reminder_last_sent')
+        ..add(serializers.serialize(object.reminderLastSent,
+            specifiedType: const FullType(String)));
+    }
+    if (object.frequencyId != null) {
+      result
+        ..add('frequency_id')
+        ..add(serializers.serialize(object.frequencyId,
+            specifiedType: const FullType(String)));
+    }
+    if (object.startDate != null) {
+      result
+        ..add('start_date')
+        ..add(serializers.serialize(object.startDate,
+            specifiedType: const FullType(String)));
+    }
+    if (object.remainingCycles != null) {
+      result
+        ..add('remaining_cycles')
+        ..add(serializers.serialize(object.remainingCycles,
+            specifiedType: const FullType(int)));
+    }
     if (object.invoiceId != null) {
       result
         ..add('invoice_id')
@@ -527,6 +563,10 @@ class _$InvoiceEntitySerializer implements StructuredSerializer<InvoiceEntity> {
           result.hasExpenses = serializers.deserialize(value,
               specifiedType: const FullType(bool)) as bool;
           break;
+        case 'exchange_rate':
+          result.exchangeRate = serializers.deserialize(value,
+              specifiedType: const FullType(double)) as double;
+          break;
         case 'reminder1_sent':
           result.reminder1Sent = serializers.deserialize(value,
               specifiedType: const FullType(String)) as String;
@@ -543,9 +583,25 @@ class _$InvoiceEntitySerializer implements StructuredSerializer<InvoiceEntity> {
           result.reminderLastSent = serializers.deserialize(value,
               specifiedType: const FullType(String)) as String;
           break;
-        case 'exchange_rate':
-          result.exchangeRate = serializers.deserialize(value,
-              specifiedType: const FullType(double)) as double;
+        case 'frequency_id':
+          result.frequencyId = serializers.deserialize(value,
+              specifiedType: const FullType(String)) as String;
+          break;
+        case 'last_sent_date':
+          result.lastSentDate = serializers.deserialize(value,
+              specifiedType: const FullType(String)) as String;
+          break;
+        case 'next_send_date':
+          result.nextSendDate = serializers.deserialize(value,
+              specifiedType: const FullType(String)) as String;
+          break;
+        case 'start_date':
+          result.startDate = serializers.deserialize(value,
+              specifiedType: const FullType(String)) as String;
+          break;
+        case 'remaining_cycles':
+          result.remainingCycles = serializers.deserialize(value,
+              specifiedType: const FullType(int)) as int;
           break;
         case 'invoice_id':
           result.invoiceId = serializers.deserialize(value,
@@ -1308,6 +1364,8 @@ class _$InvoiceEntity extends InvoiceEntity {
   @override
   final bool hasExpenses;
   @override
+  final double exchangeRate;
+  @override
   final String reminder1Sent;
   @override
   final String reminder2Sent;
@@ -1316,7 +1374,15 @@ class _$InvoiceEntity extends InvoiceEntity {
   @override
   final String reminderLastSent;
   @override
-  final double exchangeRate;
+  final String frequencyId;
+  @override
+  final String lastSentDate;
+  @override
+  final String nextSendDate;
+  @override
+  final String startDate;
+  @override
+  final int remainingCycles;
   @override
   final String invoiceId;
   @override
@@ -1394,11 +1460,16 @@ class _$InvoiceEntity extends InvoiceEntity {
       this.customTaxes3,
       this.customTaxes4,
       this.hasExpenses,
+      this.exchangeRate,
       this.reminder1Sent,
       this.reminder2Sent,
       this.reminder3Sent,
       this.reminderLastSent,
-      this.exchangeRate,
+      this.frequencyId,
+      this.lastSentDate,
+      this.nextSendDate,
+      this.startDate,
+      this.remainingCycles,
       this.invoiceId,
       this.filename,
       this.lineItems,
@@ -1521,21 +1592,15 @@ class _$InvoiceEntity extends InvoiceEntity {
     if (hasExpenses == null) {
       throw new BuiltValueNullFieldError('InvoiceEntity', 'hasExpenses');
     }
-    if (reminder1Sent == null) {
-      throw new BuiltValueNullFieldError('InvoiceEntity', 'reminder1Sent');
-    }
-    if (reminder2Sent == null) {
-      throw new BuiltValueNullFieldError('InvoiceEntity', 'reminder2Sent');
-    }
-    if (reminder3Sent == null) {
-      throw new BuiltValueNullFieldError('InvoiceEntity', 'reminder3Sent');
-    }
-    if (reminderLastSent == null) {
-      throw new BuiltValueNullFieldError('InvoiceEntity', 'reminderLastSent');
-    }
     if (exchangeRate == null) {
       throw new BuiltValueNullFieldError('InvoiceEntity', 'exchangeRate');
     }
+    if (lastSentDate == null) {
+      throw new BuiltValueNullFieldError('InvoiceEntity', 'lastSentDate');
+    }
+    if (nextSendDate == null) {
+      throw new BuiltValueNullFieldError('InvoiceEntity', 'nextSendDate');
+    }
     if (lineItems == null) {
       throw new BuiltValueNullFieldError('InvoiceEntity', 'lineItems');
     }
@@ -1610,11 +1675,16 @@ class _$InvoiceEntity extends InvoiceEntity {
         customTaxes3 == other.customTaxes3 &&
         customTaxes4 == other.customTaxes4 &&
         hasExpenses == other.hasExpenses &&
+        exchangeRate == other.exchangeRate &&
         reminder1Sent == other.reminder1Sent &&
         reminder2Sent == other.reminder2Sent &&
         reminder3Sent == other.reminder3Sent &&
         reminderLastSent == other.reminderLastSent &&
-        exchangeRate == other.exchangeRate &&
+        frequencyId == other.frequencyId &&
+        lastSentDate == other.lastSentDate &&
+        nextSendDate == other.nextSendDate &&
+        startDate == other.startDate &&
+        remainingCycles == other.remainingCycles &&
         invoiceId == other.invoiceId &&
         filename == other.filename &&
         lineItems == other.lineItems &&
@@ -1654,10 +1724,10 @@ class _$InvoiceEntity extends InvoiceEntity {
                                                                 $jc(
                                                                     $jc(
                                                                         $jc(
-                                                                            $jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc(0, amount.hashCode), balance.hashCode), clientId.hashCode), statusId.hashCode), number.hashCode), discount.hashCode), poNumber.hashCode), date.hashCode), dueDate.hashCode), publicNotes.hashCode), privateNotes.hashCode), terms.hashCode), footer.hashCode), designId.hashCode), usesInclusiveTaxes.hashCode), taxName1.hashCode), taxRate1.hashCode), taxName2.hashCode), taxRate2.hashCode), taxName3.hashCode), taxRate3.hashCode), isAmountDiscount.hashCode), partial.hashCode), taxAmount.hashCode), partialDueDate.hashCode), hasTasks.hashCode), autoBill.hashCode), customValue1.hashCode), customValue2.hashCode), customValue3.hashCode), customValue4.hashCode), customSurcharge1.hashCode), customSurcharge2.hashCode), customSurcharge3.hashCode), customSurcharge4.hashCode), customTaxes1.hashCode), customTaxes2.hashCode), customTaxes3.hashCode), customTaxes4.hashCode), hasExpenses.hashCode), reminder1Sent.hashCode), reminder2Sent.hashCode),
-                                                                                reminder3Sent.hashCode),
-                                                                            reminderLastSent.hashCode),
-                                                                        exchangeRate.hashCode),
+                                                                            $jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc($jc(0, amount.hashCode), balance.hashCode), clientId.hashCode), statusId.hashCode), number.hashCode), discount.hashCode), poNumber.hashCode), date.hashCode), dueDate.hashCode), publicNotes.hashCode), privateNotes.hashCode), terms.hashCode), footer.hashCode), designId.hashCode), usesInclusiveTaxes.hashCode), taxName1.hashCode), taxRate1.hashCode), taxName2.hashCode), taxRate2.hashCode), taxName3.hashCode), taxRate3.hashCode), isAmountDiscount.hashCode), partial.hashCode), taxAmount.hashCode), partialDueDate.hashCode), hasTasks.hashCode), autoBill.hashCode), customValue1.hashCode), customValue2.hashCode), customValue3.hashCode), customValue4.hashCode), customSurcharge1.hashCode), customSurcharge2.hashCode), customSurcharge3.hashCode), customSurcharge4.hashCode), customTaxes1.hashCode), customTaxes2.hashCode), customTaxes3.hashCode), customTaxes4.hashCode), hasExpenses.hashCode), exchangeRate.hashCode), reminder1Sent.hashCode), reminder2Sent.hashCode), reminder3Sent.hashCode), reminderLastSent.hashCode), frequencyId.hashCode), lastSentDate.hashCode),
+                                                                                nextSendDate.hashCode),
+                                                                            startDate.hashCode),
+                                                                        remainingCycles.hashCode),
                                                                     invoiceId.hashCode),
                                                                 filename.hashCode),
                                                             lineItems.hashCode),
@@ -1719,11 +1789,16 @@ class _$InvoiceEntity extends InvoiceEntity {
           ..add('customTaxes3', customTaxes3)
           ..add('customTaxes4', customTaxes4)
           ..add('hasExpenses', hasExpenses)
+          ..add('exchangeRate', exchangeRate)
           ..add('reminder1Sent', reminder1Sent)
           ..add('reminder2Sent', reminder2Sent)
           ..add('reminder3Sent', reminder3Sent)
           ..add('reminderLastSent', reminderLastSent)
-          ..add('exchangeRate', exchangeRate)
+          ..add('frequencyId', frequencyId)
+          ..add('lastSentDate', lastSentDate)
+          ..add('nextSendDate', nextSendDate)
+          ..add('startDate', startDate)
+          ..add('remainingCycles', remainingCycles)
           ..add('invoiceId', invoiceId)
           ..add('filename', filename)
           ..add('lineItems', lineItems)
@@ -1915,6 +1990,10 @@ class InvoiceEntityBuilder
   bool get hasExpenses => _$this._hasExpenses;
   set hasExpenses(bool hasExpenses) => _$this._hasExpenses = hasExpenses;
 
+  double _exchangeRate;
+  double get exchangeRate => _$this._exchangeRate;
+  set exchangeRate(double exchangeRate) => _$this._exchangeRate = exchangeRate;
+
   String _reminder1Sent;
   String get reminder1Sent => _$this._reminder1Sent;
   set reminder1Sent(String reminder1Sent) =>
@@ -1935,9 +2014,26 @@ class InvoiceEntityBuilder
   set reminderLastSent(String reminderLastSent) =>
       _$this._reminderLastSent = reminderLastSent;
 
-  double _exchangeRate;
-  double get exchangeRate => _$this._exchangeRate;
-  set exchangeRate(double exchangeRate) => _$this._exchangeRate = exchangeRate;
+  String _frequencyId;
+  String get frequencyId => _$this._frequencyId;
+  set frequencyId(String frequencyId) => _$this._frequencyId = frequencyId;
+
+  String _lastSentDate;
+  String get lastSentDate => _$this._lastSentDate;
+  set lastSentDate(String lastSentDate) => _$this._lastSentDate = lastSentDate;
+
+  String _nextSendDate;
+  String get nextSendDate => _$this._nextSendDate;
+  set nextSendDate(String nextSendDate) => _$this._nextSendDate = nextSendDate;
+
+  String _startDate;
+  String get startDate => _$this._startDate;
+  set startDate(String startDate) => _$this._startDate = startDate;
+
+  int _remainingCycles;
+  int get remainingCycles => _$this._remainingCycles;
+  set remainingCycles(int remainingCycles) =>
+      _$this._remainingCycles = remainingCycles;
 
   String _invoiceId;
   String get invoiceId => _$this._invoiceId;
@@ -2057,11 +2153,16 @@ class InvoiceEntityBuilder
       _customTaxes3 = _$v.customTaxes3;
       _customTaxes4 = _$v.customTaxes4;
       _hasExpenses = _$v.hasExpenses;
+      _exchangeRate = _$v.exchangeRate;
       _reminder1Sent = _$v.reminder1Sent;
       _reminder2Sent = _$v.reminder2Sent;
       _reminder3Sent = _$v.reminder3Sent;
       _reminderLastSent = _$v.reminderLastSent;
-      _exchangeRate = _$v.exchangeRate;
+      _frequencyId = _$v.frequencyId;
+      _lastSentDate = _$v.lastSentDate;
+      _nextSendDate = _$v.nextSendDate;
+      _startDate = _$v.startDate;
+      _remainingCycles = _$v.remainingCycles;
       _invoiceId = _$v.invoiceId;
       _filename = _$v.filename;
       _lineItems = _$v.lineItems?.toBuilder();
@@ -2142,11 +2243,16 @@ class InvoiceEntityBuilder
               customTaxes3: customTaxes3,
               customTaxes4: customTaxes4,
               hasExpenses: hasExpenses,
+              exchangeRate: exchangeRate,
               reminder1Sent: reminder1Sent,
               reminder2Sent: reminder2Sent,
               reminder3Sent: reminder3Sent,
               reminderLastSent: reminderLastSent,
-              exchangeRate: exchangeRate,
+              frequencyId: frequencyId,
+              lastSentDate: lastSentDate,
+              nextSendDate: nextSendDate,
+              startDate: startDate,
+              remainingCycles: remainingCycles,
               invoiceId: invoiceId,
               filename: filename,
               lineItems: lineItems.build(),