diff --git a/src/main/java/com/ffii/lioner/modules/lioner/commonField/entity/CommonField.java b/src/main/java/com/ffii/lioner/modules/lioner/commonField/entity/CommonField.java
index b42c664..0e9ec35 100644
--- a/src/main/java/com/ffii/lioner/modules/lioner/commonField/entity/CommonField.java
+++ b/src/main/java/com/ffii/lioner/modules/lioner/commonField/entity/CommonField.java
@@ -38,6 +38,15 @@ public class CommonField extends BaseEntity<Long>{
     @Column
 	private String noOfDependents;
 
+    @Column
+	private String fna_a_life_0;
+
+    @Column
+	private String fna_a_life_less_5;
+
+    @Column
+	private String fna_a_life_above_5;
+
     @Column
 	private String fna_c1a_amount;
 
@@ -59,6 +68,30 @@ public class CommonField extends BaseEntity<Long>{
     @Column
 	private String fna_c2a_amount;
 
+    @Column
+	private String fna_c2a_cash;
+
+    @Column
+	private String fna_c2a_market_account;
+
+    @Column
+	private String fna_c2a_bank_account;
+
+    @Column
+	private String fna_c2a_bonds;
+
+    @Column
+	private String fna_c2a_stocks;
+
+    @Column
+	private String fna_c2a_us;
+
+    @Column
+	private String fna_c2a_others;
+
+    @Column
+	private String fna_c2a_desc;
+    
     @Column
 	private String fna_c2b_amount;
 
@@ -220,6 +253,17 @@ public class CommonField extends BaseEntity<Long>{
     @Column
 	private String fna_c2f_50;
 
+    @Column
+	private String fna_d_1;
+
+    @Column
+	private String fna_d_2;
+
+    @Column
+	private String fna_d_3;
+
+    @Column
+	private String fna_d_desc;
 
     //IDA
     @Column
@@ -258,6 +302,15 @@ public class CommonField extends BaseEntity<Long>{
 
     @Column
 	private String eduPostSec;
+    
+    @Column
+	private String email;
+
+    @Column
+	private String address1;
+
+    @Column
+	private String address2;
 
     //IDA
     @Column
@@ -410,6 +463,30 @@ public class CommonField extends BaseEntity<Long>{
         this.noOfDependents = noOfDependents;
     }
 
+    public String getFna_a_life_0() {
+        return fna_a_life_0;
+    }
+
+    public void setFna_a_life_0(String fna_a_life_0) {
+        this.fna_a_life_0 = fna_a_life_0;
+    }
+
+    public String getFna_a_life_less_5() {
+        return fna_a_life_less_5;
+    }
+
+    public void setFna_a_life_less_5(String fna_a_life_less_5) {
+        this.fna_a_life_less_5 = fna_a_life_less_5;
+    }
+
+    public String getFna_a_life_above_5() {
+        return fna_a_life_above_5;
+    }
+
+    public void setFna_a_life_above_5(String fna_a_life_above_5) {
+        this.fna_a_life_above_5 = fna_a_life_above_5;
+    }
+
     public String getFna_c1a_amount() {
         return fna_c1a_amount;
     }
@@ -489,6 +566,70 @@ public class CommonField extends BaseEntity<Long>{
     public void setFna_c2a_amount(String fna_c2a_amount) {
         this.fna_c2a_amount = fna_c2a_amount;
     }
+    
+    public String getFna_c2a_cash() {
+        return fna_c2a_cash;
+    }
+
+    public void setFna_c2a_cash(String fna_c2a_cash) {
+        this.fna_c2a_cash = fna_c2a_cash;
+    }
+
+    public String getFna_c2a_market_account() {
+        return fna_c2a_market_account;
+    }
+
+    public void setFna_c2a_market_account(String fna_c2a_market_account) {
+        this.fna_c2a_market_account = fna_c2a_market_account;
+    }
+
+    public String getFna_c2a_bank_account() {
+        return fna_c2a_bank_account;
+    }
+
+    public void setFna_c2a_bank_account(String fna_c2a_bank_account) {
+        this.fna_c2a_bank_account = fna_c2a_bank_account;
+    }
+
+    public String getFna_c2a_bonds() {
+        return fna_c2a_bonds;
+    }
+
+    public void setFna_c2a_bonds(String fna_c2a_bonds) {
+        this.fna_c2a_bonds = fna_c2a_bonds;
+    }
+
+    public String getFna_c2a_stocks() {
+        return fna_c2a_stocks;
+    }
+
+    public void setFna_c2a_stocks(String fna_c2a_stocks) {
+        this.fna_c2a_stocks = fna_c2a_stocks;
+    }
+
+    public String getFna_c2a_us() {
+        return fna_c2a_us;
+    }
+
+    public void setFna_c2a_us(String fna_c2a_us) {
+        this.fna_c2a_us = fna_c2a_us;
+    }
+
+    public String getFna_c2a_others() {
+        return fna_c2a_others;
+    }
+
+    public void setFna_c2a_others(String fna_c2a_others) {
+        this.fna_c2a_others = fna_c2a_others;
+    }
+
+    public String getFna_c2a_desc() {
+        return fna_c2a_desc;
+    }
+
+    public void setFna_c2a_desc(String fna_c2a_desc) {
+        this.fna_c2a_desc = fna_c2a_desc;
+    }
 
     public String getFna_c2b_amount() {
         return fna_c2b_amount;
@@ -906,6 +1047,38 @@ public class CommonField extends BaseEntity<Long>{
         this.fna_c2f_50 = fna_c2f_50;
     }
 
+    public String getFna_d_1() {
+        return fna_d_1;
+    }
+
+    public void setFna_d_1(String fna_d_1) {
+        this.fna_d_1 = fna_d_1;
+    }
+
+    public String getFna_d_2() {
+        return fna_d_2;
+    }
+
+    public void setFna_d_2(String fna_d_2) {
+        this.fna_d_2 = fna_d_2;
+    }
+
+    public String getFna_d_3() {
+        return fna_d_3;
+    }
+
+    public void setFna_d_3(String fna_d_3) {
+        this.fna_d_3 = fna_d_3;
+    }
+
+    public String getFna_d_desc() {
+        return fna_d_desc;
+    }
+
+    public void setFna_d_desc(String fna_d_desc) {
+        this.fna_d_desc = fna_d_desc;
+    }
+
     public String getContactNo() {
         return contactNo;
     }
@@ -938,6 +1111,30 @@ public class CommonField extends BaseEntity<Long>{
         this.eduPostSec = eduPostSec;
     }
 
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getAddress1() {
+        return address1;
+    }
+
+    public void setAddress1(String address1) {
+        this.address1 = address1;
+    }
+
+    public String getAddress2() {
+        return address2;
+    }
+
+    public void setAddress2(String address2) {
+        this.address2 = address2;
+    }
+
     public String getOwn_income() {
         return own_income;
     }
diff --git a/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java b/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
index fa6217b..06ef072 100644
--- a/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
+++ b/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
@@ -4,6 +4,10 @@ import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.time.LocalDate;
+import java.time.Period;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -39,6 +43,8 @@ import com.itextpdf.kernel.pdf.PdfName;
 import com.itextpdf.kernel.pdf.PdfReader;
 import com.itextpdf.kernel.pdf.PdfWriter;
 
+import liquibase.util.StringUtil;
+
 @Service
 public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfRepository> {
 
@@ -306,6 +312,10 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
                         setValueIfPresent(form, "date_yyyy", commonField.getYyyyDateOfBirth());
                         
                         setValueIfPresent(form, "fill_17", commonField.getContactNo());
+                        setValueIfPresent(form, "fill_18", commonField.getEmail());
+                        setValueIfPresent(form, "fill_19", commonField.getAddress1());
+                        setValueIfPresent(form, "fill_19_1", commonField.getAddress2());
+
                         /* Page1 End */
                         /* Page2 Start */
                         setValueIfPresent(form, "own_income", commonField.getOwn_income());
@@ -365,14 +375,17 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
                         
                         /* Page3 End */
                         /* Page4 Start */
-                        
+                        setValueIfPresent(form, "fna_c2a_desc", commonField.getFna_c2a_desc());                        
                         /* Page4 End */
-                        /* Page5 End */                       
+                        /* Page5 Start */                       
                         setValueIfPresent(form, "fna_a_retire", commonField.getFna_a_retire());
 
                         setValueIfPresent(form, "fna_c3b_desc", commonField.getFna_c3b_desc());                    
                         /* Page5 End */
 
+                        /* Page6 Start */ 
+                        setValueIfPresent(form, "fna_d_desc", commonField.getFna_d_desc());
+                        /* Page6 End */
                     } else if("HSBCFIN".equals(formCode)){ // This is HSBCFIN
                         //logger.info("Processing HSBCFIN form (ID: 3)");
                         /* Page1 Start */
@@ -448,8 +461,59 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
 
                         /* Page3 End */
                          
+                    } else if("SLFNA_EN".equals(formCode)){ // This is SL FNA EN
+                        /*
+                         *  /* Page1 Start */
+                        setValueIfPresent(form, "name", commonField.getName());
+                        setValueIfPresent(form, "date_of_birth", commonField.getDateOfBirth());
+                        setValueIfPresent(form, "address1", commonField.getAddress1());
+                        setValueIfPresent(form, "address2", commonField.getAddress2());
+                        setValueIfPresent(form, "contact", commonField.getContactNo());
+                        setValueIfPresent(form, "email", commonField.getEmail());
+
+                        setValueIfPresent(form, "1amount", commonField.getFna_b1_d_amount());
+                        setValueIfPresent(form, "cb1f", commonField.getFna_b1_f_other());
+
+                        /* Page1 End */
+                        /* Page2 Start */
+                        setValueIfPresent(form, "4a1", commonField.getFna_c2a_amount());
+                        setValueIfPresent(form, "4b2", commonField.getFna_c2a_desc());
+                        setValueIfPresent(form, "4b3", commonField.getFna_c2b_amount());                        
+                        /* Page2 End */
+                        
+                        /* Page4 Start */
+                        setValueIfPresent(form, "6a2_other1", commonField.getFna_d_desc());
+                        /* Page4 End */
+
+                        /* special fields start */
+
+                        //age
+                        if(StringUtil.isNotEmpty(commonField.getDateOfBirth())){
+                            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd/MM/yyyy");
+
+                            try {
+                                // Parse the string into a LocalDate object
+                                LocalDate dob = LocalDate.parse(commonField.getDateOfBirth(), formatter);
+
+                                // Get the current date
+                                LocalDate currentDate = LocalDate.now();
+
+                                // Calculate the period between the two dates
+                                Period period = Period.between(dob, currentDate);
+
+                                setValueIfPresent(form, "age", String.valueOf(period.getYears()));
+
+                            } catch (DateTimeParseException e) {
+                                System.err.println("Error parsing date. Please ensure the format is dd/MM/yyyy.");                                
+                            }
+                        
+                        }
+                        /* special fields end */
                     }
 
+
+                    
+
                 }
 
                 //form.flattenFields(); // Flatten fields after setting all values
@@ -512,6 +576,10 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
                         setValueIfPresent(form2, "fna_a_primary", commonField.getEduPri());
                         setValueIfPresent(form2, "fna_a_secondary", commonField.getEduSec());
                         setValueIfPresent(form2, "fna_a_tertiary", commonField.getEduPostSec());
+                        setValueIfPresent(form2, "fna_a_life_0", commonField.getFna_a_life_0());
+                        setValueIfPresent(form2, "fna_a_life_less_5", commonField.getFna_a_life_less_5());
+                        setValueIfPresent(form2, "fna_a_life_above_5", commonField.getFna_a_life_above_5());
+
                         setValueIfPresent(form2, "fna_b1_a", commonField.getFna_b1_a());
                         setValueIfPresent(form2, "fna_b1_a_amount", commonField.getFna_b1_a_amount());
                         setValueIfPresent(form2, "fna_b1_b", commonField.getFna_b1_b());
@@ -531,6 +599,15 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
                         setValueIfPresent(form2, "fna_c1e_31_40", commonField.getFna_c1e_31_40());
                         setValueIfPresent(form2, "fna_c1e_41_50", commonField.getFna_c1e_41_50());
                         setValueIfPresent(form2, "fna_c1e_50", commonField.getFna_c1e_50());
+
+                        setValueIfPresent(form2, "fna_c2a_cash", commonField.getFna_c2a_cash());
+                        setValueIfPresent(form2, "fna_c2a_market_account", commonField.getFna_c2a_market_account());
+                        setValueIfPresent(form2, "fna_c2a_bank_account", commonField.getFna_c2a_bank_account());
+                        setValueIfPresent(form2, "fna_c2a_stocks", commonField.getFna_c2a_stocks());
+                        setValueIfPresent(form2, "fna_c2a_bonds", commonField.getFna_c2a_bonds());
+                        setValueIfPresent(form2, "fna_c2a_us", commonField.getFna_c2a_us());
+                        setValueIfPresent(form2, "fna_c2a_others", commonField.getFna_c2a_others());
+
                         setValueIfPresent(form2, "fna_c2f_10", commonField.getFna_c2f_10());
                         setValueIfPresent(form2, "fna_c2f_10_20", commonField.getFna_c2f_10_20());
                         setValueIfPresent(form2, "fna_c2f_21_30", commonField.getFna_c2f_21_30());
@@ -551,6 +628,11 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
                         setValueIfPresent(form2, "fna_c3b_investments", commonField.getFna_c3b_investments());
                         setValueIfPresent(form2, "fna_c3b_policy", commonField.getFna_c3b_policy());
                         setValueIfPresent(form2, "fna_c3b_others", commonField.getFna_c3b_others());
+
+                        setValueIfPresent(form2, "fna_d_1", commonField.getFna_d_1());
+                        setValueIfPresent(form2, "fna_d_2", commonField.getFna_d_2());
+                        setValueIfPresent(form2, "fna_d_3", commonField.getFna_d_3());
+
                         
                     } else if ("HSBCFIN".equals(formCode)) {
                         setValueIfPresent(form2, "toggle_1", commonField.getEduPri());
@@ -665,7 +747,75 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
 
                         /* Page3 End */
                          
+                    } else if("SLFNA_EN".equals(formCode)){ // This is SL FNA EN
+                        /* Page1 Start */
+                        setValueIfPresent(form2, "chh1", commonField.getEduPri()); 
+                        setValueIfPresent(form2, "chh2", commonField.getEduSec()); 
+                        setValueIfPresent(form2, "chh4", commonField.getEduPostSec()); 
+
+                        setValueIfPresent(form2, "chh5", commonField.getFna_a_life_0()); 
+                        setValueIfPresent(form2, "chh6", commonField.getFna_a_life_less_5()); 
+                        setValueIfPresent(form2, "chh7", commonField.getFna_a_life_above_5()); 
+
+                        setValueIfPresent(form2, "cb1a", commonField.getFna_b1_a()); 
+                        setValueIfPresent(form2, "cb1b", commonField.getFna_b1_b()); 
+                        setValueIfPresent(form2, "cb1c", commonField.getFna_b1_c()); 
+                        setValueIfPresent(form2, "cb1d", commonField.getFna_b1_d()); 
+                        setValueIfPresent(form2, "cb1e", commonField.getFna_b1_e()); 
+
+                        setValueIfPresent(form2, "cb10", commonField.getFna_b1b_1());
+                        setValueIfPresent(form2, "cb11", commonField.getFna_b1b_2());
+                        setValueIfPresent(form2, "cb12", commonField.getFna_b1b_3());
+
+                        setValueIfPresent(form2, "cb13", commonField.getFna_b2_a());
+                        setValueIfPresent(form2, "cb14", commonField.getFna_b2_b());
+                        setValueIfPresent(form2, "cb15", commonField.getFna_b2_c());
+                        setValueIfPresent(form2, "cb16", commonField.getFna_b2_d());
+                        setValueIfPresent(form2, "cb17", commonField.getFna_b2_e());
+                        setValueIfPresent(form2, "cb18", commonField.getFna_b2_f());
+                        setValueIfPresent(form2, "cb19", commonField.getFna_b2_g());
+
+                        /* Page1 END */
+                        /* Page2 Start */                                           
+                        setValueIfPresent(form2, "cb4a1", commonField.getFna_c1d_amount());
+                        setValueIfPresent(form2, "cb4b1", commonField.getFna_c2a_cash());
+                        setValueIfPresent(form2, "cb4b2", commonField.getFna_c2a_bank_account());
+                        setValueIfPresent(form2, "cb4b3", commonField.getFna_c2a_market_account());
+                        setValueIfPresent(form2, "cb4b4", commonField.getFna_c2a_stocks());
+                        setValueIfPresent(form2, "cb4b5", commonField.getFna_c2a_bonds());
+                        setValueIfPresent(form2, "cb4b6", commonField.getFna_c2a_us());
+                        setValueIfPresent(form2, "cb4b7", commonField.getFna_c2a_others());
+
+                        setValueIfPresent(form2, "cb4c1", commonField.getFna_c3a_2_5());
+                        setValueIfPresent(form2, "cb4c2", commonField.getFna_c3a_6_10());
+                        setValueIfPresent(form2, "cb4c3", commonField.getFna_c3a_11_15());
+                        setValueIfPresent(form2, "cb4c4", commonField.getFna_c3a_16_20());
+                        setValueIfPresent(form2, "cb4c5", commonField.getFna_c3a_life());
+                        setValueIfPresent(form2, "cb4c6", commonField.getFna_c3a_single_pay());
+
+                        setValueIfPresent(form2, "cb4d1", commonField.getFna_c1e_10());
+                        setValueIfPresent(form2, "cb4d2", commonField.getFna_c1e_10_20());
+                        setValueIfPresent(form2, "cb4d3", commonField.getFna_c1e_21_30());  
+                        setValueIfPresent(form2, "cb4d4", commonField.getFna_c1e_31_40());
+                        setValueIfPresent(form2, "cb4d5", commonField.getFna_c1e_41_50());
+                        setValueIfPresent(form2, "cb4d6", commonField.getFna_c1e_50());
+
+                        setValueIfPresent(form2, "cb4e1", commonField.getFna_c3b_salary());
+                        setValueIfPresent(form2, "cb4e2", commonField.getFna_c3b_income());
+                        setValueIfPresent(form2, "cb4e3", commonField.getFna_c3b_investments());
+                        setValueIfPresent(form2, "cb4e4", commonField.getFna_c3b_saving());
+                        setValueIfPresent(form2, "cb4e5", commonField.getFna_c3b_others());
+                        
+                        setValueIfPresent(form2, "cb4h1", commonField.getFna_c3c_yes());
+                        setValueIfPresent(form2, "cb4h2", commonField.getFna_c3c_no());
+                        /* Page2 End */
+
+                        /* Page4 Start */
+                        setValueIfPresent(form2, "cb6a1", commonField.getFna_d_1());
+                        setValueIfPresent(form2, "cb6a2", commonField.getFna_d_3());                        
+                        /* Page4 End */
                     }
+                   
                         
                 }
                      
@@ -821,8 +971,12 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
                         case "date_dd" -> commonField.setDdDateOfBirth(fieldValue);
                         case "date_mm" -> commonField.setMmDateOfBirth(fieldValue);
                         case "date_yyyy" -> commonField.setYyyyDateOfBirth(fieldValue);
-                        
+
                         case "fill_17" -> commonField.setContactNo(fieldValue);
+                        case "fill_18" -> commonField.setEmail(fieldValue);
+                        case "fill_19" -> commonField.setAddress1(fieldValue);
+                        case "fill_19_1" -> commonField.setAddress2(fieldValue);
+                                                
                         case "edu_pri" -> commonField.setEduPri(fieldValue);
                         case "edu_sec" -> commonField.setEduSec(fieldValue);
                         case "edu_post_sec" -> commonField.setEduPostSec(fieldValue);
@@ -861,6 +1015,10 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
                         case "fna_a_birth" -> commonField.setDateOfBirth(fieldValue);
                         case "fna_a_id_card" -> commonField.setIdCard(fieldValue);
                         case "fna_a_occupation" -> commonField.setOccupation(fieldValue);
+
+                        case "fna_a_life_0" -> commonField.setFna_a_life_0(fieldValue);
+                        case "fna_a_life_less_5" -> commonField.setFna_a_life_less_5(fieldValue);
+                        case "fna_a_life_above_5" -> commonField.setFna_a_life_above_5(fieldValue);
                         
                         case "fna_a_primary" -> commonField.setEduPri(fieldValue);
                         case "fna_a_secondary" -> commonField.setEduSec(fieldValue);
@@ -877,6 +1035,15 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
                         case "fna_c1c_3_amount" -> commonField.setFna_c1c_3_amount(fieldValue);
                         case "fna_c1d_amount" -> commonField.setFna_c1d_amount(fieldValue);
                         case "fna_c2a_amount" -> commonField.setFna_c2a_amount(fieldValue);
+
+                        case "fna_c2a_cash" -> commonField.setFna_c2a_cash(fieldValue);
+                        case "fna_c2a_market_account" -> commonField.setFna_c2a_market_account(fieldValue);
+                        case "fna_c2a_bank_account" -> commonField.setFna_c2a_bank_account(fieldValue);
+                        case "fna_c2a_stocks" -> commonField.setFna_c2a_stocks(fieldValue);
+                        case "fna_c2a_bonds" -> commonField.setFna_c2a_bonds(fieldValue);
+                        case "fna_c2a_us" -> commonField.setFna_c2a_us(fieldValue);
+                        case "fna_c2a_others" -> commonField.setFna_c2a_others(fieldValue);
+                        case "fna_c2a_desc" -> commonField.setFna_c2a_desc(fieldValue);
                         
                         case "fna_c2b_amount" -> commonField.setFna_c2b_amount(fieldValue);
                         case "fna_c2c_amount" -> commonField.setFna_c2c_amount(fieldValue);
@@ -940,7 +1107,12 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
                         case "fna_c3c_yes" -> commonField.setFna_c3c_yes(fieldValue);
                         case "fna_c3c_no" -> commonField.setFna_c3c_no(fieldValue);
                         /* Page5 End */
-                        
+                        /* Page6 Start */
+                        case "fna_d_1" -> commonField.setFna_d_1(fieldValue);
+                        case "fna_d_2" -> commonField.setFna_d_2(fieldValue);
+                        case "fna_d_3" -> commonField.setFna_d_3(fieldValue);
+                        case "fna_d_desc" -> commonField.setFna_d_desc(fieldValue);                        
+                        /* Page6 End */
                     }
                 }
 
@@ -1132,6 +1304,102 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
                     }
                 }
                 //
+
+                if ("SLFNA_EN".equals(formCode)) {
+                    switch (fieldName) {
+                        /* Page1 Start */
+                        case "name" -> commonField.setName(fieldValue);
+                        case "date_of_birth" -> commonField.setDateOfBirth(fieldValue);
+                        case "occupation" -> commonField.setOccupation(fieldValue);
+                        case "address1" -> commonField.setAddress1(fieldValue);
+                        case "address2" -> commonField.setAddress2(fieldValue);
+                        case "contact" -> commonField.setContactNo(fieldValue);
+                        case "email" -> commonField.setEmail(fieldValue);
+
+                        case "chh1" -> commonField.setEduPri(fieldValue);
+                        case "chh2" -> commonField.setEduSec(fieldValue);
+                        case "chh3" -> commonField.setEduPostSec(fieldValue);
+                        case "chh4" -> commonField.setEduPostSec(fieldValue); //duplicate now
+
+                        case "chh5" -> commonField.setFna_a_life_0(fieldValue);
+                        case "chh6" -> commonField.setFna_a_life_less_5(fieldValue);
+                        case "chh7" -> commonField.setFna_a_life_above_5(fieldValue);
+
+                        case "cb1a" -> commonField.setFna_b1_a(fieldValue);
+                        case "cb1b" -> commonField.setFna_b1_b(fieldValue);
+                        case "cb1c" -> commonField.setFna_b1_c(fieldValue);
+                        case "cb1d" -> commonField.setFna_b1_d(fieldValue);
+                        case "1amount" -> commonField.setFna_b1_d_amount(fieldValue);
+                        case "cb1e" -> commonField.setFna_b1_e(fieldValue);
+                        case "cb1f" -> commonField.setFna_b1_f_other(fieldValue);
+
+                        case "cb10" -> commonField.setFna_b1b_1(fieldValue);
+                        case "cb11" -> commonField.setFna_b1b_2(fieldValue);
+                        case "cb12" -> commonField.setFna_b1b_3(fieldValue);
+                        
+                        case "cb13" -> commonField.setFna_b2_a(fieldValue);
+                        case "cb14" -> commonField.setFna_b2_b(fieldValue);
+                        case "cb15" -> commonField.setFna_b2_c(fieldValue);
+                        case "cb16" -> commonField.setFna_b2_d(fieldValue);
+                        case "cb17" -> commonField.setFna_b2_e(fieldValue);
+                        case "cb18" -> commonField.setFna_b2_f(fieldValue);
+                        case "cb19" -> commonField.setFna_b2_g(fieldValue);
+                        /* Page1 End */
+
+                        /* Page2 Start */                        
+                        case "cb4a1" -> commonField.setFna_c1d_amount(fieldValue); //need to set the check box when get                        
+
+                        case "4a1" -> commonField.setFna_c2a_amount(fieldValue);
+                        case "cb4b1" -> commonField.setFna_c2a_cash(fieldValue);
+                        case "cb4b2" -> commonField.setFna_c2a_bank_account(fieldValue);
+                        case "cb4b3" -> commonField.setFna_c2a_market_account(fieldValue);
+                        case "cb4b4" -> commonField.setFna_c2a_stocks(fieldValue);
+                        case "cb4b5" -> commonField.setFna_c2a_bonds(fieldValue);
+                        case "cb4b6" -> commonField.setFna_c2a_us(fieldValue);
+                        case "cb4b7" -> commonField.setFna_c2a_others(fieldValue);
+                        case "4b2" -> commonField.setFna_c2a_desc(fieldValue);
+
+                        case "4b3" -> commonField.setFna_c2b_amount(fieldValue);
+
+                        case "cb4c1" -> commonField.setFna_c3a_2_5(fieldValue);
+                        case "cb4c2" -> commonField.setFna_c3a_6_10(fieldValue);
+                        case "cb4c3" -> commonField.setFna_c3a_11_15(fieldValue);
+                        case "cb4c4" -> commonField.setFna_c3a_16_20(fieldValue);
+                        case "cb4c5" -> commonField.setFna_c3a_life(fieldValue);
+                        case "cb4c6" -> commonField.setFna_c3a_single_pay(fieldValue);
+
+                        case "cb4d1" -> commonField.setFna_c1e_10(fieldValue);
+                        case "cb4d2" -> commonField.setFna_c1e_10_20(fieldValue);
+                        case "cb4d3" -> commonField.setFna_c1e_21_30(fieldValue);
+                        case "cb4d4" -> commonField.setFna_c1e_31_40(fieldValue);
+                        case "cb4d5" -> commonField.setFna_c1e_41_50(fieldValue);
+                        case "cb4d6" -> commonField.setFna_c1e_50(fieldValue);
+
+                        case "cb4e1" -> commonField.setFna_c3b_salary(fieldValue);
+                        case "cb4e2" -> commonField.setFna_c3b_income(fieldValue);
+                        case "cb4e3" -> commonField.setFna_c3b_investments(fieldValue);
+                        case "cb4e4" -> commonField.setFna_c3b_saving(fieldValue);
+                        case "cb4e5" -> commonField.setFna_c3b_others(fieldValue);
+                        case "4e" -> commonField.setFna_c3b_desc(fieldValue);
+
+                        case "cb4h1" -> commonField.setFna_c3c_yes(fieldValue);
+                        case "cb4h2" -> commonField.setFna_c3c_no(fieldValue);
+                        
+                        /* Page2 End */
+
+
+                        /* Page4 Start */
+                        case "cb6a1" -> commonField.setFna_d_1(fieldValue);
+                        case "cb6a2" -> commonField.setFna_d_3(fieldValue);
+                        case "6a2_other1" -> commonField.setFna_d_desc(fieldValue);
+                        /* Page4 End */
+
+                    }
+
+                    /* Special logic Start */
+                    
+                    /* Special logic End */
+                }
                 
                 //logger.info("end Field: " + field.getPartialName() + ", Value: " + field.getValueAsString());
                 // You can save this data to a database, or perform other operations
diff --git a/src/main/resources/db/changelog/changes/14_add_common_fields_SL/01_add_common_field.sql b/src/main/resources/db/changelog/changes/14_add_common_fields_SL/01_add_common_field.sql
new file mode 100644
index 0000000..5d5b46e
--- /dev/null
+++ b/src/main/resources/db/changelog/changes/14_add_common_fields_SL/01_add_common_field.sql
@@ -0,0 +1,23 @@
+--liquibase formatted sql
+
+--changeset vin:add common fields
+
+ALTER TABLE `lionerdb`.`common_field` 
+ADD COLUMN `fna_a_life_0` VARCHAR(45) NULL AFTER `others_funds_desc`,
+ADD COLUMN `fna_a_life_less_5` VARCHAR(45) NULL AFTER `fna_a_life_0`,
+ADD COLUMN `fna_a_life_above_5` VARCHAR(45) NULL AFTER `fna_a_life_less_5`,
+ADD COLUMN `fna_c2a_cash` VARCHAR(45) NULL AFTER `fna_a_life_above_5`,
+ADD COLUMN `fna_c2a_market_account` VARCHAR(45) NULL AFTER `fna_c2a_cash`,
+ADD COLUMN `fna_c2a_bank_account` VARCHAR(45) NULL AFTER `fna_c2a_market_account`,
+ADD COLUMN `fna_c2a_bonds` VARCHAR(45) NULL AFTER `fna_c2a_bank_account`,
+ADD COLUMN `fna_c2a_stocks` VARCHAR(45) NULL AFTER `fna_c2a_bonds`,
+ADD COLUMN `fna_c2a_us` VARCHAR(45) NULL AFTER `fna_c2a_stocks`,
+ADD COLUMN `fna_c2a_others` VARCHAR(45) NULL AFTER `fna_c2a_us`,
+ADD COLUMN `fna_c2a_desc` VARCHAR(500) NULL AFTER `fna_c2a_others`,
+ADD COLUMN `fna_d_1` VARCHAR(45) NULL AFTER `fna_c2a_desc`,
+ADD COLUMN `fna_d_2` VARCHAR(45) NULL AFTER `fna_d_1`,
+ADD COLUMN `fna_d_3` VARCHAR(45) NULL AFTER `fna_d_2`,
+ADD COLUMN `fna_d_desc` VARCHAR(500) NULL AFTER `fna_d_3`,
+ADD COLUMN `email` VARCHAR(500) NULL AFTER `fna_d_desc`,
+ADD COLUMN `address1` VARCHAR(2000) NULL AFTER `email`,
+ADD COLUMN `address2` VARCHAR(2000) NULL AFTER `address1`;