diff --git a/src/main/java/com/ffii/fpsms/m18/M18Config.kt b/src/main/java/com/ffii/fpsms/m18/M18Config.kt
index 2919ae8..92008e9 100644
--- a/src/main/java/com/ffii/fpsms/m18/M18Config.kt
+++ b/src/main/java/com/ffii/fpsms/m18/M18Config.kt
@@ -10,62 +10,64 @@ import org.springframework.context.annotation.Configuration
 open class M18Config {
 
     // Account
-//    @Value("\${m18.config.grant-type}")
-    val GRANT_TYPE: String = "password";
+    @Value("\${m18.config.grant-type}")
+    lateinit var GRANT_TYPE: String;
 
-//    @Value("\${m18.config.client-id}")
-    val CLIENT_ID: String = "M2Y1OGYxMmQtZDRiOS00OTA4LTgyNTktZDRkNzEzNWVkMzRm";
+    @Value("\${m18.config.client-id}")
+    lateinit var CLIENT_ID: String;
 
-//    @Value("\${m18.config.client-secret}")
-    val CLIENT_SECRET: String = "M2Y2YjQzYzQtZTc2Mi00OTFhLTkwYmItYmJhMzFjZjEyYmY5";
+    @Value("\${m18.config.client-secret}")
+    lateinit var CLIENT_SECRET: String;
 
-//    @Value("\${m18.config.username}")
-    val USERNAME: String = "testingMTMS";
+    @Value("\${m18.config.username}")
+    lateinit var USERNAME: String;
 
-//    @Value("\${m18.config.password}")
-    val PASSWORD: String = "db25f2fc14cd2d2b1e7af307241f548fb03c312a";
+    @Value("\${m18.config.password}")
+    lateinit var PASSWORD: String;
 
-    val BASE_URL: String = "http://16.162.251.126/jsf/rfws"
+    @Value("\${m18.config.base-url}")
+    lateinit var BASE_URL: String;
 
     // Supplier
-//    @Value("\${m18.config.supplier-not.material-po}")
 //    var MATERIAL_PO_SUPPLIER_NOT: List<String> = listOf("P06", "P07", "T62"); // If need oem type
-    val MATERIAL_PO_SUPPLIER_NOT: List<String> = listOf("P06", "P07");
 
-//    @Value("\${m18.config.supplier.shop-po}")
-    val SHOP_PO_SUPPLIER: List<String> = listOf("P06", "P07");
+    @Value("\${m18.config.supplier-not.material-po}")
+    lateinit var MATERIAL_PO_SUPPLIER_NOT: List<String>;
 
-//    @Value("\${m18.config.supplier.oem-po}")
-    val OEM_PO_SUPPLIER: List<String> = listOf("T62");
+    @Value("\${m18.config.supplier.shop-po}")
+    lateinit var SHOP_PO_SUPPLIER: List<String>;
+
+    @Value("\${m18.config.supplier.oem-po}")
+    lateinit var OEM_PO_SUPPLIER: List<String>;
 
     // Series
-//    @Value("\${m18.config.seriesId.pp}")
-    val SERIESID_PP: Long = 26;
+    @Value("\${m18.config.seriesId.pp}")
+    lateinit var SERIESID_PP: String;
 
-//    @Value("\${m18.config.seriesId.pf}")
-    val SERIESID_PF: Long = 33;
+    @Value("\${m18.config.seriesId.pf}")
+    lateinit var SERIESID_PF: String;
 
-//    @Value("\${m18.config.seriesId.sc}")
-    val SERIESID_SC: Long = 27;
+    @Value("\${m18.config.seriesId.sc}")
+    lateinit var SERIESID_SC: String;
 
-//    @Value("\${m18.config.seriesId.se}")
-    val SERIESID_SE: Long = 28;
+    @Value("\${m18.config.seriesId.se}")
+    lateinit var SERIESID_SE: String;
 
-//    @Value("\${m18.config.seriesId.sf}")
-    val SERIESID_SF: Long = 70;
+    @Value("\${m18.config.seriesId.sf}")
+    lateinit var SERIESID_SF: String;
 
-//    @Value("\${m18.config.seriesId.sr}")
-    val SERIESID_SR: Long = 29;
+    @Value("\${m18.config.seriesId.sr}")
+    lateinit var SERIESID_SR: String;
 
     // BE
-//    @Value("\${m18.config.beId.pp}")
-    val BEID_PP: Long = 29;
+    @Value("\${m18.config.beId.pp}")
+    lateinit var BEID_PP: String;
 
-//    @Value("\${m18.config.beId.pf}")
-    val BEID_PF: Long = 27;
+    @Value("\${m18.config.beId.pf}")
+    lateinit var BEID_PF: String;
 
-//    @Value("\${m18.config.beId.toa}")
-    val BEID_TOA: Long = 1;
+    @Value("\${m18.config.beId.toa}")
+    lateinit var BEID_TOA: String;
 
     // Fetch
     var ACCESS_TOKEN: String? = null;