diff --git a/src/section/base/full.typ b/src/section/base/full.typ
index e9da0a4..c331955 100644
--- a/src/section/base/full.typ
+++ b/src/section/base/full.typ
@@ -5,6 +5,7 @@
       title: "",
       subtitle: "",
       role: "",
+      role_subtitle: "",
       timeframe: "",
       skills: (""),
       highlights: (""),
diff --git a/src/section/base/item.typ b/src/section/base/item.typ
index 9bc8cbc..824f639 100644
--- a/src/section/base/item.typ
+++ b/src/section/base/item.typ
@@ -2,6 +2,7 @@
   title: "",
   subtitle: "",
   role: "",
+  role_subtitle: "",
   timeframe: "",
   skills: (""),
   highlights: (""),
@@ -15,6 +16,7 @@
       title: title,
       subtitle: subtitle,
       role: role,
+      role_subtitle: role_subtitle,
       timeframe: timeframe,
       skills: skills,
     ),
diff --git a/src/section/base/item/heading.typ b/src/section/base/item/heading.typ
index 7be0bd9..3663f03 100644
--- a/src/section/base/item/heading.typ
+++ b/src/section/base/item/heading.typ
@@ -2,6 +2,7 @@
     title: "",
     subtitle: "",
     role: "",
+    role_subtitle: "",
     timeframe: "",
     skills: (""),
   ) = {
@@ -23,7 +24,10 @@
       subtitle: subtitle,
     ),
     section_base_item_heading_timeframe(timeframe: timeframe),
-    section_base_item_heading_role(role: role),
+    section_base_item_heading_role(
+      title: role,
+      subtitle: role_subtitle,
+    ),
     section_base_item_heading_skills(skills: skills),
   )
 }
diff --git a/src/section/base/item/heading/role.typ b/src/section/base/item/heading/role.typ
index a2e544d..632b6ee 100644
--- a/src/section/base/item/heading/role.typ
+++ b/src/section/base/item/heading/role.typ
@@ -1,5 +1,15 @@
-#let section_base_item_heading_role(role: "") = text(
-  weight: "light",
-  size: .9em,
-  role
-)
+#let section_base_item_heading_role(
+  title: "",
+  subtitle: "",
+) = {
+  import "role/main.typ": section_base_item_heading_role_main
+  import "role/subtitle.typ": section_base_item_heading_role_subtitle
+  
+  grid(
+    columns: 2,
+    gutter: 1.5em,
+    align: bottom,
+    section_base_item_heading_role_main(title: title),
+    section_base_item_heading_role_subtitle(subtitle: subtitle),
+  )
+}
diff --git a/src/section/base/item/heading/role/main.typ b/src/section/base/item/heading/role/main.typ
new file mode 100644
index 0000000..46ba3ac
--- /dev/null
+++ b/src/section/base/item/heading/role/main.typ
@@ -0,0 +1,5 @@
+#let section_base_item_heading_role_main(title: "") = text(
+  weight: "light",
+  size: .9em,
+  title
+)
diff --git a/src/section/base/item/heading/role/subtitle.typ b/src/section/base/item/heading/role/subtitle.typ
new file mode 100644
index 0000000..b38c516
--- /dev/null
+++ b/src/section/base/item/heading/role/subtitle.typ
@@ -0,0 +1,7 @@
+#let section_base_item_heading_role_subtitle(
+    subtitle: "",
+) = text(
+  size: .85em,
+  weight: "extralight",
+  subtitle
+)
diff --git a/src/section/work_experience.typ b/src/section/work_experience.typ
index 16c6971..d0213fa 100644
--- a/src/section/work_experience.typ
+++ b/src/section/work_experience.typ
@@ -15,10 +15,10 @@
   section_base_full(
     title: "Work Experience",
     items: work_experience.map(company => (
-      title: company.title,
-      subtitle: company.location,
+      title: company.role,
       timeframe: company.timeframe,
-      role: company.role,
+      role: company.title,
+      role_subtitle: company.location,
       skills: company.skills,
       highlights: company.highlights,
     )),