diff --git a/database/migrations/2020_01_02_100001_create_matrix_releases_table.php b/database/migrations/2020_01_02_100001_create_matrix_releases_table.php
index c47197d..12bc7ec 100644
--- a/database/migrations/2020_01_02_100001_create_matrix_releases_table.php
+++ b/database/migrations/2020_01_02_100001_create_matrix_releases_table.php
@@ -62,9 +62,11 @@ public function up(): void
             $table->dateTime('canceled_at')->nullable();
             $table->dateTime('closed_at')->nullable()->index();
             $table->dateTime('embargo_at')->nullable();
+            $table->dateTime('fixed_at')->nullable();
             $table->dateTime('postponed_at')->nullable();
             $table->dateTime('published_at')->nullable();
             $table->dateTime('released_at')->nullable();
+            $table->dateTime('resolved_at')->nullable();
             $table->dateTime('resumed_at')->nullable();
             $table->dateTime('suspended_at')->nullable();
 
@@ -106,6 +108,7 @@ public function up(): void
             $table->boolean('closed')->default(0);
             $table->boolean('completed')->default(0);
             $table->boolean('cron')->default(0)->index();
+            $table->boolean('fixed')->default(0);
             $table->boolean('flagged')->default(0);
             $table->boolean('internal')->default(0);
             $table->boolean('locked')->default(0);
@@ -114,6 +117,8 @@ public function up(): void
             $table->boolean('problem')->default(0);
             $table->boolean('published')->default(0);
             $table->boolean('released')->default(0);
+            $table->boolean('retired')->default(0);
+            $table->boolean('resolved')->default(0);
             $table->boolean('suspended')->default(0);
             $table->boolean('unknown')->default(0);
 
diff --git a/database/migrations/2020_01_02_100001_create_matrix_roadmaps_table.php b/database/migrations/2020_01_02_100001_create_matrix_roadmaps_table.php
index 62f479a..f4aedb3 100644
--- a/database/migrations/2020_01_02_100001_create_matrix_roadmaps_table.php
+++ b/database/migrations/2020_01_02_100001_create_matrix_roadmaps_table.php
@@ -114,7 +114,6 @@ public function up(): void
             $table->boolean('problem')->default(0);
             $table->boolean('published')->default(0);
             $table->boolean('released')->default(0);
-            $table->boolean('resolved')->default(0);
             $table->boolean('suspended')->default(0);
             $table->boolean('unknown')->default(0);
 
diff --git a/database/migrations/2020_01_02_100001_create_matrix_sources_table.php b/database/migrations/2020_01_02_100001_create_matrix_sources_table.php
index f9a54ce..c2282d0 100644
--- a/database/migrations/2020_01_02_100001_create_matrix_sources_table.php
+++ b/database/migrations/2020_01_02_100001_create_matrix_sources_table.php
@@ -106,8 +106,8 @@ public function up(): void
             $table->boolean('problem')->default(0);
             $table->boolean('published')->default(0);
             $table->boolean('released')->default(0);
-            $table->boolean('retired')->default(0);
             $table->boolean('resolved')->default(0);
+            $table->boolean('retired')->default(0);
             $table->boolean('suspended')->default(0);
             $table->boolean('unknown')->default(0);
 
diff --git a/database/migrations/2020_01_02_100001_create_matrix_sprints_table.php b/database/migrations/2020_01_02_100001_create_matrix_sprints_table.php
index 3936cc0..e365d22 100644
--- a/database/migrations/2020_01_02_100001_create_matrix_sprints_table.php
+++ b/database/migrations/2020_01_02_100001_create_matrix_sprints_table.php
@@ -118,8 +118,8 @@ public function up(): void
             $table->boolean('problem')->default(0);
             $table->boolean('published')->default(0);
             $table->boolean('released')->default(0);
-            $table->boolean('retired')->default(0);
             $table->boolean('resolved')->default(0);
+            $table->boolean('retired')->default(0);
             $table->boolean('suspended')->default(0);
             $table->boolean('unknown')->default(0);
 
diff --git a/database/migrations/2020_01_02_100001_create_matrix_tickets_table.php b/database/migrations/2020_01_02_100001_create_matrix_tickets_table.php
index 5352dfd..041301e 100644
--- a/database/migrations/2020_01_02_100001_create_matrix_tickets_table.php
+++ b/database/migrations/2020_01_02_100001_create_matrix_tickets_table.php
@@ -124,8 +124,8 @@ public function up(): void
             $table->boolean('problem')->default(0);
             $table->boolean('published')->default(0);
             $table->boolean('released')->default(0);
-            $table->boolean('retired')->default(0);
             $table->boolean('resolved')->default(0);
+            $table->boolean('retired')->default(0);
             $table->boolean('special')->default(0);
             $table->boolean('suspended')->default(0);
             $table->boolean('unknown')->default(0);
diff --git a/database/migrations/2020_01_02_100001_create_matrix_versions_table.php b/database/migrations/2020_01_02_100001_create_matrix_versions_table.php
index a4637b7..502b576 100644
--- a/database/migrations/2020_01_02_100001_create_matrix_versions_table.php
+++ b/database/migrations/2020_01_02_100001_create_matrix_versions_table.php
@@ -108,8 +108,8 @@ public function up(): void
             $table->boolean('problem')->default(0);
             $table->boolean('published')->default(0);
             $table->boolean('released')->default(0);
-            $table->boolean('retired')->default(0);
             $table->boolean('resolved')->default(0);
+            $table->boolean('retired')->default(0);
             $table->boolean('suspended')->default(0);
             $table->boolean('unknown')->default(0);
 
diff --git a/src/Models/Release.php b/src/Models/Release.php
index 591833b..e913522 100644
--- a/src/Models/Release.php
+++ b/src/Models/Release.php
@@ -43,9 +43,11 @@
  * @property ?Carbon $canceled_at
  * @property ?Carbon $closed_at
  * @property ?Carbon $embargo_at
+ * @property ?Carbon $fixed_at
  * @property ?Carbon $postponed_at
  * @property ?Carbon $published_at
  * @property ?Carbon $released_at
+ * @property ?Carbon $resolved_at
  * @property ?Carbon $resumed_at
  * @property ?Carbon $suspended_at
  * @property int $gids
@@ -76,6 +78,7 @@
  * @property bool $completed
  * @property bool $cron
  * @property bool $flagged
+ * @property bool $fixed
  * @property bool $internal
  * @property bool $locked
  * @property bool $pending
@@ -83,6 +86,8 @@
  * @property bool $problem
  * @property bool $published
  * @property bool $released
+ * @property bool $resolved
+ * @property bool $retired
  * @property bool $suspended
  * @property bool $unknown
  * @property string $label
@@ -148,9 +153,11 @@ class Release extends Model
         'canceled_at' => null,
         'closed_at' => null,
         'embargo_at' => null,
+        'fixed_at' => null,
         'postponed_at' => null,
         'published_at' => null,
         'released_at' => null,
+        'resolved_at' => null,
         'resumed_at' => null,
         'suspended_at' => null,
         'gids' => 0,
@@ -181,6 +188,7 @@ class Release extends Model
         'completed' => false,
         'cron' => false,
         'flagged' => false,
+        'fixed' => false,
         'internal' => false,
         'locked' => false,
         'pending' => false,
@@ -188,6 +196,8 @@ class Release extends Model
         'problem' => false,
         'published' => false,
         'released' => false,
+        'resolved' => false,
+        'retired' => false,
         'suspended' => false,
         'unknown' => false,
         'label' => '',
@@ -245,9 +255,11 @@ class Release extends Model
         'canceled_at',
         'closed_at',
         'embargo_at',
+        'fixed_at',
         'postponed_at',
         'published_at',
         'released_at',
+        'resolved_at',
         'resumed_at',
         'suspended_at',
         'gids',
@@ -278,6 +290,7 @@ class Release extends Model
         'completed',
         'cron',
         'flagged',
+        'fixed',
         'internal',
         'locked',
         'pending',
@@ -285,6 +298,7 @@ class Release extends Model
         'problem',
         'published',
         'released',
+        'retired',
         'suspended',
         'unknown',
         'label',
@@ -329,9 +343,11 @@ protected function casts(): array
             'canceled_at' => 'datetime',
             'closed_at' => 'datetime',
             'embargo_at' => 'datetime',
+            'fixed_at' => 'datetime',
             'postponed_at' => 'datetime',
             'published_at' => 'datetime',
             'released_at' => 'datetime',
+            'resolved_at' => 'datetime',
             'resumed_at' => 'datetime',
             'suspended_at' => 'datetime',
             'gids' => 'integer',
@@ -362,6 +378,7 @@ protected function casts(): array
             'completed' => 'boolean',
             'cron' => 'boolean',
             'flagged' => 'boolean',
+            'fixed' => 'boolean',
             'internal' => 'boolean',
             'locked' => 'boolean',
             'pending' => 'boolean',
@@ -369,6 +386,8 @@ protected function casts(): array
             'problem' => 'boolean',
             'published' => 'boolean',
             'released' => 'boolean',
+            'resolved' => 'boolean',
+            'retired' => 'boolean',
             'suspended' => 'boolean',
             'unknown' => 'boolean',
             'label' => 'string',
diff --git a/src/Models/Roadmap.php b/src/Models/Roadmap.php
index 76bd300..f0558f1 100644
--- a/src/Models/Roadmap.php
+++ b/src/Models/Roadmap.php
@@ -83,7 +83,6 @@
  * @property bool $problem
  * @property bool $published
  * @property bool $released
- * @property bool $resolved
  * @property bool $suspended
  * @property bool $unknown
  * @property string $label
diff --git a/src/Models/Source.php b/src/Models/Source.php
index e8b92c8..d0e85c5 100644
--- a/src/Models/Source.php
+++ b/src/Models/Source.php
@@ -126,10 +126,12 @@ class Source extends Model
         'canceled_at' => null,
         'closed_at' => null,
         'embargo_at' => null,
+        'fixed_at' => null,
         'postponed_at' => null,
         'published_at' => null,
         'released_at' => null,
         'resumed_at' => null,
+        'resolved_at' => null,
         'suspended_at' => null,
         'gids' => 0,
         'po' => 0,
@@ -158,6 +160,8 @@ class Source extends Model
         'closed' => false,
         'completed' => false,
         'cron' => false,
+        'duplicate' => false,
+        'fixed' => false,
         'flagged' => false,
         'internal' => false,
         'locked' => false,
@@ -166,6 +170,8 @@ class Source extends Model
         'problem' => false,
         'published' => false,
         'released' => false,
+        'retired' => false,
+        'resolved' => false,
         'suspended' => false,
         'unknown' => false,
         'label' => '',
@@ -207,10 +213,12 @@ class Source extends Model
         'canceled_at',
         'closed_at',
         'embargo_at',
+        'fixed_at',
         'postponed_at',
         'published_at',
         'released_at',
         'resumed_at',
+        'resolved_at',
         'suspended_at',
         'gids',
         'po',
@@ -239,6 +247,8 @@ class Source extends Model
         'closed',
         'completed',
         'cron',
+        'duplicate',
+        'fixed',
         'flagged',
         'internal',
         'locked',
@@ -247,6 +257,8 @@ class Source extends Model
         'problem',
         'published',
         'released',
+        'resolved',
+        'retired',
         'suspended',
         'unknown',
         'label',
@@ -287,10 +299,12 @@ protected function casts(): array
             'canceled_at' => 'datetime',
             'closed_at' => 'datetime',
             'embargo_at' => 'datetime',
+            'fixed_at' => 'datetime',
             'postponed_at' => 'datetime',
             'published_at' => 'datetime',
             'released_at' => 'datetime',
             'resumed_at' => 'datetime',
+            'resolved_at' => 'datetime',
             'suspended_at' => 'datetime',
             'gids' => 'integer',
             'po' => 'integer',
@@ -319,6 +333,8 @@ protected function casts(): array
             'closed' => 'boolean',
             'completed' => 'boolean',
             'cron' => 'boolean',
+            'duplicate' => 'boolean',
+            'fixed' => 'boolean',
             'flagged' => 'boolean',
             'internal' => 'boolean',
             'locked' => 'boolean',
@@ -327,6 +343,8 @@ protected function casts(): array
             'problem' => 'boolean',
             'published' => 'boolean',
             'released' => 'boolean',
+            'resolved' => 'boolean',
+            'retired' => 'boolean',
             'suspended' => 'boolean',
             'unknown' => 'boolean',
             'label' => 'string',