diff --git a/AppendCMS.sh b/AppendCMS.sh
index 66c926b..215a0f5 100644
--- a/AppendCMS.sh
+++ b/AppendCMS.sh
@@ -11,16 +11,8 @@ rm /tmp/apt.list
 source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/ModulesMenu.list)
 
 #Setting Menulist to webserver
-if [[ $webserv = "apache" ]]; then
-#Apache Menulist
-CMSL=("${apacheCMSL[@]}")
-options=("${apacheOptions[@]}")
-fi
-if [[ $webserv = "nginx" ]]; then
-#Nginx Menulist
-CMSL=("${nginxCMSL[@]}")
-options=("${nginxOptions[@]}")
-fi
+declare -n CMSL="$webserv"CMSL
+declare -n options="$webserv"Options
 
 
 ##----------------##
diff --git a/AppendModule.sh b/AppendModule.sh
index 63c2848..085f636 100644
--- a/AppendModule.sh
+++ b/AppendModule.sh
@@ -15,16 +15,8 @@ rm /tmp/apt.list
 source <(curl --retry 7 --retry-delay 5 -s "$repo"/raw/branch/"$branch"/ModulesMenu.list)
 
 #Setting Menulist to webserver
-if [[ $webserv = "apache" ]]; then
-#Apache Menulist
-CMSL=("${apacheCMSL[@]}")
-options=("${apacheOptions[@]}")
-fi
-if [[ $webserv = "nginx" ]]; then
-#Nginx Menulist
-CMSL=("${nginxCMSL[@]}")
-options=("${nginxOptions[@]}")
-fi
+declare -n CMSL="$webserv"CMSL
+declare -n options="$webserv"Options
 
 #Filtering already installed modules
 for target in "${SelectedOptions[@]}"; do