diff --git a/db/Beckhoff_3XXX/ecmcEL3314-0090.substitutions b/db/Beckhoff_3XXX/ecmcEL3314-0090.substitutions
deleted file mode 120000
index 6f9a0e71d..000000000
--- a/db/Beckhoff_3XXX/ecmcEL3314-0090.substitutions
+++ /dev/null
@@ -1 +0,0 @@
-ecmcEL3314.substitutions
\ No newline at end of file
diff --git a/general/init.cmd b/general/init.cmd
index 7a97cd6ba..170908ab0 100644
--- a/general/init.cmd
+++ b/general/init.cmd
@@ -46,9 +46,3 @@ epicsEnvSet("ECMC_TSE",               0)
 #- Init all axis related variables
 ${ECMC_SUPPORT_MOTION=""}ecmcFileExist("${ECMC_CONFIG_ROOT}initAxis.cmd",1)
 ${ECMC_SUPPORT_MOTION=""}${SCRIPTEXEC} "${ECMC_CONFIG_ROOT}initAxis.cmd"
-
-#- Additional parameters when motor Records are loaded
-${ECMC_USE_MOTOR_RECORD=""}epicsEnvSet("ECMC_EGU",               "mm")
-${ECMC_USE_MOTOR_RECORD=""}epicsEnvSet("ECMC_PREC",              3)
-${ECMC_USE_MOTOR_RECORD=""}epicsEnvSet("ECMC_AXISFIELDINIT",     "")                  # Extra field init to motor record
-${ECMC_USE_MOTOR_RECORD=""}epicsEnvSet("ECMC_AXISCONFIG",        "")                  # Extra parameters to driver
diff --git a/hardware/Beckhoff_3XXX/EL/ecmcEL3311.cmd b/hardware/Beckhoff_3XXX/EL/ecmcEL3311.cmd
new file mode 100644
index 000000000..b0a8f17c0
--- /dev/null
+++ b/hardware/Beckhoff_3XXX/EL/ecmcEL3311.cmd
@@ -0,0 +1,19 @@
+#-d /**
+#-d   \brief hardware script for EL3311
+#-d   \details EL3311 | 1-channel thermocouple input terminal with open-circuit recognition
+#-d   \author Markus Kristensson, Carlos Doro Neto
+#-d   \file
+#-d   \note SDOS
+#-d   \param [out] SDO 0x1011:01 --> 1684107116 \b reset
+#-d */
+
+
+epicsEnvSet("ECMC_EC_HWTYPE"             "EL3311")
+epicsEnvSet("ECMC_EC_VENDOR_ID"          "0x2")
+epicsEnvSet("ECMC_EC_PRODUCT_ID"         "0x0cef3052")
+
+#- verify slave, including reset
+${SCRIPTEXEC} ${ecmccfg_DIR}slaveVerify.cmd "RESET=true"
+
+#- analog input Ch1
+${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_16bit.cmd "CH_ID=01,ECMC_PDO=0x1a00,ECMC_ENTRY=0x6000"
diff --git a/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0002.cmd b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0002.cmd
index 6214cb22b..3b902954b 100644
--- a/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0002.cmd
+++ b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0002.cmd
@@ -1,7 +1,7 @@
 #-d /**
 #-d   \brief hardware script for EL3314-0002
 #-d   \details EL3314-0002 | 4-channel (24 bits) thermocouple input terminal with open-circuit recognition
-#-d   \author Anders Sandstroem
+#-d   \author Anders Sandstroem, Markus Kristensson, Carlos Doro Neto
 #-d   \file
 #-d   \note SDOS
 #-d   \param [out] SDO 0x1011:01 --> 1684107116 \b reset
@@ -12,14 +12,4 @@ epicsEnvSet("ECMC_EC_HWTYPE"             "EL3314-0002")
 epicsEnvSet("ECMC_EC_VENDOR_ID"          "0x2")
 epicsEnvSet("ECMC_EC_PRODUCT_ID"         "0x0cf23052")
 
-#- verify slave, including reset
-${SCRIPTEXEC} ${ecmccfg_DIR}slaveVerify.cmd "RESET=true"
-
-#- analog input Ch1
-${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=01,ECMC_PDO=0x1a00,ECMC_ENTRY=0x6000"
-#- analog input Ch2
-${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=02,ECMC_PDO=0x1a01,ECMC_ENTRY=0x6010"
-#- analog input Ch3
-${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=03,ECMC_PDO=0x1a02,ECMC_ENTRY=0x6020"
-#- analog input Ch4
-${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=04,ECMC_PDO=0x1a03,ECMC_ENTRY=0x6030"
+${SCRIPTEXEC} ${ecmccfg_DIR}ecmcEL3314-XXXX_generic.cmd
diff --git a/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0010.cmd b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0010.cmd
new file mode 100644
index 000000000..5166388be
--- /dev/null
+++ b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0010.cmd
@@ -0,0 +1,15 @@
+#-d /**
+#-d   \brief hardware script for EL3314-0010
+#-d   \details EL3314-0010 | 4-channel (24 bits) thermocouple, high precision, input terminal with open-circuit recognition
+#-d   \author Markus Kristensson, Carlos Doro Neto
+#-d   \file
+#-d   \note SDOS
+#-d   \param [out] SDO 0x1011:01 --> 1684107116 \b reset
+#-d */
+
+
+epicsEnvSet("ECMC_EC_HWTYPE"             "EL3314-0010")
+epicsEnvSet("ECMC_EC_VENDOR_ID"          "0x2")
+epicsEnvSet("ECMC_EC_PRODUCT_ID"         "0x0cf23052")
+
+${SCRIPTEXEC} ${ecmccfg_DIR}ecmcEL3314-XXXX_generic.cmd
diff --git a/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0020.cmd b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0020.cmd
new file mode 100644
index 000000000..708805b87
--- /dev/null
+++ b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0020.cmd
@@ -0,0 +1,15 @@
+#-d /**
+#-d   \brief hardware script for EL3314-0020
+#-d   \details EL3314-0020 | 4-channel (24 bits) thermocouple, high precision, factory calibrated, input terminal with open-circuit recognition
+#-d   \author Markus Kristensson, Carlos Doro Neto
+#-d   \file
+#-d   \note SDOS
+#-d   \param [out] SDO 0x1011:01 --> 1684107116 \b reset
+#-d */
+
+
+epicsEnvSet("ECMC_EC_HWTYPE"             "EL3314-0020")
+epicsEnvSet("ECMC_EC_VENDOR_ID"          "0x2")
+epicsEnvSet("ECMC_EC_PRODUCT_ID"         "0x0cf23052")
+
+${SCRIPTEXEC} ${ecmccfg_DIR}ecmcEL3314-XXXX_generic.cmd
diff --git a/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0030.cmd b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0030.cmd
new file mode 100644
index 000000000..fdfe7c61f
--- /dev/null
+++ b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-0030.cmd
@@ -0,0 +1,15 @@
+#-d /**
+#-d   \brief hardware script for EL3314-0030
+#-d   \details EL3314-0030 | 4-channel (24 bits) thermocouple, high precision, externally calibrated, input terminal with open-circuit recognition
+#-d   \author Markus Kristensson, Carlos Doro Neto
+#-d   \file
+#-d   \note SDOS
+#-d   \param [out] SDO 0x1011:01 --> 1684107116 \b reset
+#-d */
+
+
+epicsEnvSet("ECMC_EC_HWTYPE"             "EL3314-0030")
+epicsEnvSet("ECMC_EC_VENDOR_ID"          "0x2")
+epicsEnvSet("ECMC_EC_PRODUCT_ID"         "0x0cf23052")
+
+${SCRIPTEXEC} ${ecmccfg_DIR}ecmcEL3314-XXXX_generic.cmd
diff --git a/hardware/Beckhoff_3XXX/EL/ecmcEL3314-XXXX_generic.cmd b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-XXXX_generic.cmd
new file mode 100644
index 000000000..3b949109d
--- /dev/null
+++ b/hardware/Beckhoff_3XXX/EL/ecmcEL3314-XXXX_generic.cmd
@@ -0,0 +1,21 @@
+#-d /**
+#-d   \brief hardware script for EL3314-XXXX
+#-d   \details EL3314-XXXX | Generic script for EL3314-XXXX modules.
+#-d   \author Markus Kristensson, Carlos Doro Netos
+#-d   \file
+#-d   \note SDOS
+#-d   \param [out] SDO 0x1011:01 --> 1684107116 \b reset
+#-d */
+
+
+#- verify slave, including reset
+${SCRIPTEXEC} ${ecmccfg_DIR}slaveVerify.cmd "RESET=true"
+
+#- analog input Ch1
+${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=01,ECMC_PDO=0x1a00,ECMC_ENTRY=0x6000"
+#- analog input Ch2
+${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=02,ECMC_PDO=0x1a01,ECMC_ENTRY=0x6010"
+#- analog input Ch3
+${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=03,ECMC_PDO=0x1a02,ECMC_ENTRY=0x6020"
+#- analog input Ch4
+${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_32bit.cmd "CH_ID=04,ECMC_PDO=0x1a03,ECMC_ENTRY=0x6030"
diff --git a/hardware/Beckhoff_3XXX/EL/ecmcEL3318.cmd b/hardware/Beckhoff_3XXX/EL/ecmcEL3318.cmd
new file mode 100644
index 000000000..a90ffdcba
--- /dev/null
+++ b/hardware/Beckhoff_3XXX/EL/ecmcEL3318.cmd
@@ -0,0 +1,33 @@
+#-d /**
+#-d   \brief hardware script for EL3318
+#-d   \details EL3318 | 8-channel (16 bits) thermocouple input terminal with open-circuit recognition
+#-d   \author Markus Kristensson, Carlos Doro Neto
+#-d   \file
+#-d   \note SDOS
+#-d   \param [out] SDO 0x1011:01 --> 1684107116 \b reset
+#-d */
+
+
+epicsEnvSet("ECMC_EC_HWTYPE"             "EL3318")
+epicsEnvSet("ECMC_EC_VENDOR_ID"          "0x2")
+epicsEnvSet("ECMC_EC_PRODUCT_ID"         "0x0cf63052")
+
+#- verify slave, including reset
+${SCRIPTEXEC} ${ecmccfg_DIR}slaveVerify.cmd "RESET=true"
+
+#- analog input Ch1
+${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_16bit.cmd "CH_ID=01,ECMC_PDO=0x1a00,ECMC_ENTRY=0x6000"
+#- analog input Ch2
+${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_16bit.cmd "CH_ID=02,ECMC_PDO=0x1a01,ECMC_ENTRY=0x6010"
+#- analog input Ch3
+${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_16bit.cmd "CH_ID=03,ECMC_PDO=0x1a02,ECMC_ENTRY=0x6020"
+#- analog input Ch4
+${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_16bit.cmd "CH_ID=04,ECMC_PDO=0x1a03,ECMC_ENTRY=0x6030"
+#- analog input Ch5
+${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_16bit.cmd "CH_ID=05,ECMC_PDO=0x1a04,ECMC_ENTRY=0x6040"
+#- analog input Ch6
+${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_16bit.cmd "CH_ID=06,ECMC_PDO=0x1a05,ECMC_ENTRY=0x6050"
+#- analog input Ch7
+${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_16bit.cmd "CH_ID=07,ECMC_PDO=0x1a06,ECMC_ENTRY=0x6060"
+#- analog input Ch8
+${SCRIPTEXEC} ${ecmccfg_DIR}ecmcAnalogInput_16bit.cmd "CH_ID=08,ECMC_PDO=0x1a07,ECMC_ENTRY=0x6070"