diff --git a/.gitignore b/.gitignore
index e2a025fd4..8c6e03892 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,6 @@
 build
 profiles
-
-# ADJ
-JSON_ADE
+backend/cmd/cmd
 
 # MacOS Files
 .DS_Store
@@ -10,4 +8,4 @@ JSON_ADE
 # Code Editor
 .idea/
 .vscode/
-.prettierrc
\ No newline at end of file
+.prettierrc
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..d1a8618fc
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "backend/cmd/JSON_ADE"]
+	path = backend/cmd/JSON_ADE
+	url = https://github.com/HyperloopUPV-H8/JSON_ADE.git
+	branch = main
diff --git a/backend/cmd/JSON_ADE b/backend/cmd/JSON_ADE
new file mode 160000
index 000000000..7a3da6697
--- /dev/null
+++ b/backend/cmd/JSON_ADE
@@ -0,0 +1 @@
+Subproject commit 7a3da66976be16f28cab96e9c63f18fb0ab664f7
diff --git a/backend/cmd/main.go b/backend/cmd/main.go
index 8df788305..01a35b5b2 100644
--- a/backend/cmd/main.go
+++ b/backend/cmd/main.go
@@ -559,12 +559,16 @@ func getIPIPfilter() string {
 }
 
 func getUDPFilter(addrs []net.IP, backendAddr net.IP, port uint16) string {
-	udpPort := fmt.Sprintf("udp port %d", port)
-	udpAddrs := common.Map(addrs, func(addr net.IP) string {
+	udpPort := "udp" // TODO use proper ports for the filter
+	srcUdpAddrs := common.Map(addrs, func(addr net.IP) string {
 		return fmt.Sprintf("(src host %s)", addr)
 	})
+	dstUdpAddrs := common.Map(addrs, func(addr net.IP) string {
+		return fmt.Sprintf("(dst host %s)", addr)
+	})
 
-	udpAddrsStr := strings.Join(udpAddrs, " or ")
+	srcUdpAddrsStr := strings.Join(srcUdpAddrs, " or ")
+	dstUdpAddrsStr := strings.Join(dstUdpAddrs, " or ")
 
-	return fmt.Sprintf("(%s) and (%s) and (dst host %s)", udpPort, udpAddrsStr, backendAddr)
+	return fmt.Sprintf("(%s) and (%s) and (%s or (dst host %s))", udpPort, srcUdpAddrsStr, dstUdpAddrsStr, backendAddr)
 }
diff --git a/backend/internal/pod_data/measurement.go b/backend/internal/pod_data/measurement.go
index 869c69168..b75247146 100644
--- a/backend/internal/pod_data/measurement.go
+++ b/backend/internal/pod_data/measurement.go
@@ -55,13 +55,11 @@ func getNumericMeasurement(adeMeas adj.Measurement, globalUnits map[string]utils
 	warningRange := adeMeas.WarningRange
 
 	displayUnits, err := utils.ParseUnits(adeMeas.DisplayUnits, globalUnits)
-
 	if err != nil {
 		measErrs.Add(err)
 	}
 
 	podUnits, err := utils.ParseUnits(adeMeas.PodUnits, globalUnits)
-
 	if err != nil {
 		measErrs.Add(err)
 	}
@@ -87,14 +85,10 @@ func getEnumMeasurement(adeMeas adj.Measurement) EnumMeasurement {
 		Id:      adeMeas.Id,
 		Name:    adeMeas.Name,
 		Type:    EnumType,
-		Options: getEnumMembers(adeMeas.EnumValues),
+		Options: adeMeas.EnumValues,
 	}
 }
 
-func getEnumMembers(enumExp []string) []string {
-	return enumExp
-}
-
 func getBooleanMeasurement(adeMeas adj.Measurement) BooleanMeasurement {
 	return BooleanMeasurement{
 		Id:   adeMeas.Id,
diff --git a/backend/internal/pod_data/pod_data.go b/backend/internal/pod_data/pod_data.go
index a85bc7644..156bc42b8 100644
--- a/backend/internal/pod_data/pod_data.go
+++ b/backend/internal/pod_data/pod_data.go
@@ -38,8 +38,6 @@ func getBoard(adjBoard adj.Board, globalUnits map[string]utils.Operations) (Boar
 
 	packets := make([]Packet, 0)
 
-	// TESTING
-
 	for _, adjPacket := range adjBoard.Packets {
 		packet, err := getPacket(adjPacket) // Black magic fuck
 		if err != nil {
diff --git a/backend/internal/utils/range.go b/backend/internal/utils/range.go
deleted file mode 100644
index 2a6695c8e..000000000
--- a/backend/internal/utils/range.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package utils
-
-import (
-	"errors"
-	"strconv"
-	"strings"
-)
-
-func ParseRange(literal string) ([]*float64, error) {
-	if literal == "" {
-		return []*float64{nil, nil}, nil
-	}
-
-	strRange := strings.Split(strings.TrimSuffix(strings.TrimPrefix(strings.Replace(literal, " ", "", -1), "["), "]"), ",")
-
-	if len(strRange) != 2 {
-		return nil, errors.New("invalid range")
-	}
-
-	numRange := make([]*float64, 0)
-
-	if strRange[0] != "" {
-		lowerBound, errLowerBound := strconv.ParseFloat(strRange[0], 64)
-
-		if errLowerBound != nil {
-			return nil, errors.New("parsing lower bound")
-		}
-
-		numRange = append(numRange, &lowerBound)
-	} else {
-		numRange = append(numRange, nil)
-	}
-
-	if strRange[1] != "" {
-		upperBound, errUpperBound := strconv.ParseFloat(strRange[1], 64)
-
-		if errUpperBound != nil {
-			return nil, errors.New("parsing upper bound")
-		}
-
-		numRange = append(numRange, &upperBound)
-	} else {
-		numRange = append(numRange, nil)
-	}
-
-	return numRange, nil
-}