diff --git a/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.json b/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.json
index aafe69e..96e31f5 100644
--- a/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.json
+++ b/MCU_STM32F1xx_Matlab/stm32f1xx_matlab_conf.json
@@ -1,49 +1,26 @@
 {
   "MainCode": {
-    "Sources": {
-      "Type": "files",
-      "Options": [
-        "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c",
-        "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c",
-        "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c",
-        "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c",
-        "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c",
-        "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.c",
-        "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.c",
-        "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c",
-        "Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c"
-      ]
-    },
-    "Includes": {
-      "Type": "paths",
-      "Options": [
-        ".",
-        "Drivers/STM32F1xx_SIMULINK",
-        "Drivers/CMSIS",
-        "Drivers/CMSIS/Device/STM32F1xx",
-        "Drivers/STM32F1xx_HAL_Driver/Inc",
-        "Drivers/STM32F1xx_HAL_Driver/Inc/Legacy"
-      ]
-    }
+    "Includes": [
+      ".",
+      "Drivers/STM32F1xx_SIMULINK",
+      "Drivers/CMSIS",
+      "Drivers/CMSIS/Device/STM32F1xx",
+      "Drivers/STM32F1xx_HAL_Driver/Inc",
+      "Drivers/STM32F1xx_HAL_Driver/Inc/Legacy"
+    ]
   },
   "UserCode": {
     "Functions": {
-      "PeriphInit": {
-        "Options": [
-          "Initialize_Periph_Sim()"
-        ]
-      },
-      "PeriphSimulation": {
-        "Options": [
-          "Simulate_TIMs()",
-          "Simulate_GPIO_BSRR()"
-        ]
-      },
-      "PeriphDeinit": {
-        "Options": [
-          "deInitialize_Periph_Sim()"
-        ]
-      }
+      "PeriphInit": [
+        "Initialize_Periph_Sim()"
+      ],
+      "PeriphSimulation": [
+        "Simulate_TIMs()",
+        "Simulate_GPIO_BSRR()"
+      ],
+      "PeriphDeinit": [
+        "deInitialize_Periph_Sim()"
+      ]
     }
   },
   "Main": {
@@ -67,7 +44,7 @@
       "Tab_TIM_Enable": {
         "Prompt": "Enable TIMs",
         "Type": "checkbox",
-        "Default": false,
+        "Default": true,
         "NewRow": true
       },
       "Tab_ADC_Enable": {
diff --git a/MCU_Wrapper/run_mex.bat b/MCU_Wrapper/run_mex.bat
index 2969767..d137726 100644
--- a/MCU_Wrapper/run_mex.bat
+++ b/MCU_Wrapper/run_mex.bat
@@ -50,21 +50,7 @@ set code_WRAPPER= %code_WRAPPER% %code_APP_WRAPPER%
 
 
 :: PERIPH BAT START
-set code_PERIPH=.\MCU_STM32F1xx_Matlab\stm32f1xx_matlab_conf.c^
- .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_SIMULINK\stm32f1xx_matlab_gpio.c^
- .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_SIMULINK\stm32f1xx_periph_registers.c^
- .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_SIMULINK\stm32f1xx_matlab_tim.c^
- .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_tim.c^
- .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_tim_ex.c^
- .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_rcc.c^
- .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_gpio.c^
- .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_pwr.c^
- .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cortex.c^
- .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal.c^
- .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_adc.c^
- .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_adc_ex.c^
- .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_dma.c^
- .\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_exti.c
+set code_PERIPH=.\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_SIMULINK\stm32f1xx_matlab_tim.c
 
 set includes_PERIPH=-I".\MCU_STM32F1xx_Matlab\."^
  -I".\MCU_STM32F1xx_Matlab\Drivers\STM32F1xx_SIMULINK"^