diff --git a/misc/setomc.sh b/misc/setomc.sh
index 1f2e5712..62bbadb6 100644
--- a/misc/setomc.sh
+++ b/misc/setomc.sh
@@ -1,13 +1,14 @@
 #!/bin/bash
 
-C_ARG=""
-M_ARG="*"
+C_ARG_LOWER=""
+M_ARG_LOWER="*"
 
 check_args() {
     while getopts "c:m:" option; do
         case $option in
             c)  
-                C_ARG=$(echo $OPTARG | tr '[:upper:]' '[:lower:]')
+                C_ARG_LOWER=$(echo $OPTARG | tr '[:upper:]' '[:lower:]')
+                C_ARG_UPPER=$(echo $OPTARG | tr '[:lower:]' '[:upper:]')
                 ;;  
             m)  
                 M_ARG=$(echo $OPTARG | tr '[:upper:]' '[:lower:]')
@@ -28,82 +29,48 @@ UpgradeSQLDir=/usr/local/omc/etc/db/upgrade
 Upgvue3SQLDir=/usr/local/omc/etc/db/upgvue3
 InstallSQLDir=/usr/local/omc/etc/db/install
 OMCStaticDir=/usr/local/omc/static
-CustomizedDirBA=${OMCStaticDir}/ba.d
-CustomizedDirAGT=${OMCStaticDir}/agt.d
-CustomizedDirGeneric=${OMCStaticDir}/generic.d
 
 check_args "$@"
 
 case "${M_ARG}" in
-	install)
-		${OMCBinDir}/importdb.sh ${M_ARG}
+    install)
+        ${OMCBinDir}/importdb.sh ${M_ARG}
 
-		case "$C_ARG" in
-		    ba)
-				echo "Setting BA customized OMC ..."
-				for SQL in ${CustomizedDirBA}/db/*.sql; do 
-					mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; 
-				done
-				cp -rf ${CustomizedDirBA}/logo/* ${OMCStaticDir}/logo
-				cp -rf ${CustomizedDirBA}/doc/* ${OMCStaticDir}/helpDoc
-				;;
-			agt)
-				echo "Setting AGT customized OMC ..."
-				for SQL in ${CustomizedDirBA}/db/*.sql; do 
-					mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; 
-				done
-				cp -rf ${CustomizedDirBA}/logo/* ${OMCStaticDir}/logo
-				cp -rf ${CustomizedDirBA}/doc/* ${OMCStaticDir}/helpDoc
-				;;
-
-			*)
-				echo "Setting Generic OMC ..."
-				for SQL in ${CustomizedDirGeneric}/db/*.sql; do 
-					mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; 
-				done		
-				cp -rf ${CustomizedDirGeneric}/logo/* ${OMCStaticDir}/logo
-				cp -rf ${CustomizedDirGeneric}/doc/* ${OMCStaticDir}/helpDoc
-				;;
-			"")
-				;;
-		esac		
-		;;
-	upgrade | upgvue3)
-		${OMCBinDir}/importdb.sh ${M_ARG}
-		;;
-	skip)
-		case "$C_ARG" in
-		    ba)
-				echo "Setting BA customized OMC ..."
-				for SQL in ${CustomizedDirBA}/db/*.sql; do 
-					mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; 
-				done
-				cp -rf ${CustomizedDirBA}/logo/* ${OMCStaticDir}/logo
-				cp -rf ${CustomizedDirBA}/doc/* ${OMCStaticDir}/helpDoc
-				;;
-			agt)
-				echo "Setting AGT customized OMC ..."
-				for SQL in ${CustomizedDirBA}/db/*.sql; do 
-					mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; 
-				done
-				cp -rf ${CustomizedDirBA}/logo/* ${OMCStaticDir}/logo
-				cp -rf ${CustomizedDirBA}/doc/* ${OMCStaticDir}/helpDoc
-				;;
-
-			*)
-				echo "Setting Generic OMC ..."
-				for SQL in ${CustomizedDirGeneric}/db/*.sql; do 
-					mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; 
-				done		
-				cp -rf ${CustomizedDirGeneric}/logo/* ${OMCStaticDir}/logo
-				cp -rf ${CustomizedDirGeneric}/doc/* ${OMCStaticDir}/helpDoc
-				;;
-			"")
-				;;
-		esac	
-		;;	
-	*)
-		${OMCBinDir}/importdb.sh
-		;;
+        if [ "${C_ARG_LOWER}" != "" ]; then
+           CustomizedDir=${OMCStaticDir}/${C_ARG_LOWER}.d
+           if [ ! -d "${CustomizedDir}" ]; then
+               echo "Not found ${C_ARG_UPPER} customized directory, nothing to be done"
+               exit 1
+           fi  
+           echo "Setting ${C_ARG_UPPER} customized OMC ..."
+           for SQL in ${CustomizedDir}/db/*.sql; do  
+                   mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; 
+           done
+           cp -rf ${CustomizedDir}/logo/* ${OMCStaticDir}/logo
+           cp -rf ${CustomizedDir}/doc/* ${OMCStaticDir}/helpDoc
+        fi       
+        ;;
+    upgrade | upgvue3)
+        ${OMCBinDir}/importdb.sh ${M_ARG}
+        ;;
+    skip)
+        if [ "${C_ARG_LOWER}" != "" ]; then
+           CustomizedDir=${OMCStaticDir}/${C_ARG_LOWER}.d
+           if [ ! -d "${CustomizedDir}" ]; then
+               echo "Not found ${C_ARG_UPPER} customized directory, nothing to be done"
+               exit 1
+           fi  
+           echo "Setting ${C_ARG_UPPER} customized OMC ..."
+           for SQL in ${CustomizedDir}/db/*.sql; do  
+                   mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL}; 
+           done
+           cp -rf ${CustomizedDir}/logo/* ${OMCStaticDir}/logo
+           cp -rf ${CustomizedDir}/doc/* ${OMCStaticDir}/helpDoc
+        fi
+        ;;    
+    *)
+        ${OMCBinDir}/importdb.sh
+        ;;
 esac
 
+exit 0
\ No newline at end of file