diff --git a/app/dashboards/tracked_time_entry_dashboard.rb b/app/dashboards/tracked_time_entry_dashboard.rb
index 8a4b0f5..1c64468 100644
--- a/app/dashboards/tracked_time_entry_dashboard.rb
+++ b/app/dashboards/tracked_time_entry_dashboard.rb
@@ -11,7 +11,7 @@ class TrackedTimeEntryDashboard < Administrate::BaseDashboard
     id: Field::Number,
     associated_toggl_entry_id: Field::Number,
     kind: Field::Select.with_options(searchable: false, collection: ->(field) { field.resource.class.send(field.attribute.to_s.pluralize).keys }),
-    lecture: Field::BelongsTo,
+    subject: Field::Polymorphic.with_options(classes: [Lecture, WorkItem]),
     toggl_data: Field::String.with_options(searchable: false),
     created_at: Field::DateTime,
     updated_at: Field::DateTime,
@@ -26,7 +26,7 @@ class TrackedTimeEntryDashboard < Administrate::BaseDashboard
     id
     associated_toggl_entry_id
     kind
-    lecture
+    subject
   ].freeze
 
   # SHOW_PAGE_ATTRIBUTES
@@ -35,7 +35,7 @@ class TrackedTimeEntryDashboard < Administrate::BaseDashboard
     id
     associated_toggl_entry_id
     kind
-    lecture
+    subject
     toggl_data
     created_at
     updated_at
@@ -47,7 +47,7 @@ class TrackedTimeEntryDashboard < Administrate::BaseDashboard
   FORM_ATTRIBUTES = %i[
     associated_toggl_entry_id
     kind
-    lecture
+    subject
     toggl_data
   ].freeze
 
diff --git a/app/dashboards/work_item_dashboard.rb b/app/dashboards/work_item_dashboard.rb
index 233a91b..84b1f37 100644
--- a/app/dashboards/work_item_dashboard.rb
+++ b/app/dashboards/work_item_dashboard.rb
@@ -10,7 +10,8 @@ class WorkItemDashboard < Administrate::BaseDashboard
   ATTRIBUTE_TYPES = {
     id: Field::Number,
     course: Field::BelongsTo,
-    due_date: Field::DateTime,
+    available_from: Field::DateTime,
+    due_at: Field::DateTime,
     title: Field::String,
     tracked_time_entries: Field::HasMany,
     document_link: Field::String,
@@ -26,7 +27,8 @@ class WorkItemDashboard < Administrate::BaseDashboard
   COLLECTION_ATTRIBUTES = %i[
     id
     course
-    due_date
+    available_from
+    due_at
     title
     document_link
   ].freeze
@@ -35,9 +37,10 @@ class WorkItemDashboard < Administrate::BaseDashboard
   # an array of attributes that will be displayed on the model's show page.
   SHOW_PAGE_ATTRIBUTES = %i[
     id
-    course
-    due_date
     title
+    course
+    available_from
+    due_at
     document_link
     tracked_time_entries
     created_at
@@ -48,9 +51,10 @@ class WorkItemDashboard < Administrate::BaseDashboard
   # an array of attributes that will be displayed
   # on the model's form (`new` and `edit`) pages.
   FORM_ATTRIBUTES = %i[
-    course
-    due_date
     title
+    course
+    available_from
+    due_at
     document_link
     tracked_time_entries
   ].freeze