diff --git a/src/main/java/me/aboullaite/controller/ExportController.java b/src/main/java/me/aboullaite/controller/ExportController.java
index 64eb182..e514966 100644
--- a/src/main/java/me/aboullaite/controller/ExportController.java
+++ b/src/main/java/me/aboullaite/controller/ExportController.java
@@ -1,17 +1,20 @@
 package me.aboullaite.controller;
 
+
 import me.aboullaite.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 
+
 @Controller
 public class ExportController {
 
     @Autowired
     private UserService userService;
 
+
     /**
      * Handle request to download an Excel document
      */
@@ -19,6 +22,11 @@ public class ExportController {
     public String download(Model model) {
 
         model.addAttribute("users", userService.findAllUsers());
+        String[] header = {"FirstName", "LastName", "LastName", "JobTitle", "Company", "Address", "City", "Country",
+                "PhoneNumber"};
+        model.addAttribute("header",header);
+
+
         return "";
     }
 
diff --git a/src/main/java/me/aboullaite/view/CsvView.java b/src/main/java/me/aboullaite/view/CsvView.java
index 1e353f6..90f3936 100644
--- a/src/main/java/me/aboullaite/view/CsvView.java
+++ b/src/main/java/me/aboullaite/view/CsvView.java
@@ -20,8 +20,7 @@ protected void buildCsvDocument(Map<String, Object> model, HttpServletRequest re
         response.setHeader("Content-Disposition", "attachment; filename=\"my-csv-file.csv\"");
 
         List<User> users = (List<User>) model.get("users");
-        String[] header = {"FirstName", "LastName", "LastName", "JobTitle", "Company", "Address", "City", "Country",
-                "PhoneNumber"};
+        String[] header = ( String[]) model.get("header");
         ICsvBeanWriter csvWriter = new CsvBeanWriter(response.getWriter(),
                 CsvPreference.STANDARD_PREFERENCE);
 
diff --git a/src/main/java/me/aboullaite/view/ExcelView.java b/src/main/java/me/aboullaite/view/ExcelView.java
index 3416fb9..6312f29 100644
--- a/src/main/java/me/aboullaite/view/ExcelView.java
+++ b/src/main/java/me/aboullaite/view/ExcelView.java
@@ -39,27 +39,13 @@ protected void buildExcelDocument(Map<String, Object> model,
         style.setFont(font);
 
 
-        // create header row
         Row header = sheet.createRow(0);
-        header.createCell(0).setCellValue("FirstName");
-        header.getCell(0).setCellStyle(style);
-        header.createCell(1).setCellValue("LastName");
-        header.getCell(1).setCellStyle(style);
-        header.createCell(2).setCellValue("Age");
-        header.getCell(2).setCellStyle(style);
-        header.createCell(3).setCellValue("Job Title");
-        header.getCell(3).setCellStyle(style);
-        header.createCell(4).setCellValue("Company");
-        header.getCell(4).setCellStyle(style);
-        header.createCell(5).setCellValue("Address");
-        header.getCell(5).setCellStyle(style);
-        header.createCell(6).setCellValue("City");
-        header.getCell(6).setCellStyle(style);
-        header.createCell(7).setCellValue("Country");
-        header.getCell(7).setCellStyle(style);
-        header.createCell(8).setCellValue("Phone Number");
-        header.getCell(8).setCellStyle(style);
 
+        String[] headerFields = ( String[]) model.get("header");
+        for (int i=0;i<headerFields.length;i++){
+            header.createCell(i).setCellValue(headerFields[i]);
+            header.getCell(i).setCellStyle(style);
+        }
 
 
         int rowCount = 1;
diff --git a/src/main/java/me/aboullaite/view/PdfView.java b/src/main/java/me/aboullaite/view/PdfView.java
index f044625..7366732 100644
--- a/src/main/java/me/aboullaite/view/PdfView.java
+++ b/src/main/java/me/aboullaite/view/PdfView.java
@@ -35,33 +35,15 @@ protected void buildPdfDocument(Map<String, Object> model, Document document, Pd
         cell.setBackgroundColor(BaseColor.DARK_GRAY);
         cell.setPadding(5);
 
-        // write table header
-        cell.setPhrase(new Phrase("First Name", font));
-        table.addCell(cell);
 
-        cell.setPhrase(new Phrase("Last Name", font));
-        table.addCell(cell);
+        String[] headerFields = ( String[]) model.get("header");
+        for (int i=0;i<headerFields.length;i++){
 
-        cell.setPhrase(new Phrase("Age", font));
-        table.addCell(cell);
-
-        cell.setPhrase(new Phrase("Job Title", font));
-        table.addCell(cell);
-
-        cell.setPhrase(new Phrase("Company", font));
-        table.addCell(cell);
-
-        cell.setPhrase(new Phrase("Address", font));
-        table.addCell(cell);
-
-        cell.setPhrase(new Phrase("City", font));
-        table.addCell(cell);
+            cell.setPhrase(new Phrase(headerFields[i], font));
+            table.addCell(cell);
+        }
 
-        cell.setPhrase(new Phrase("Country", font));
-        table.addCell(cell);
 
-        cell.setPhrase(new Phrase("Phone Number", font));
-        table.addCell(cell);
 
         for(User user : users){
             table.addCell(user.getFirstName());