diff --git a/agent/bin/datasid-agent.sh b/agent/bin/datasid-agent.sh
index fc01a3fde781efbbfca8b521c9b26328077fc86d..d9ab473eedd3675465f314826103efadd26ae527 100755
--- a/agent/bin/datasid-agent.sh
+++ b/agent/bin/datasid-agent.sh
@@ -159,7 +159,7 @@ if test ${updateStatus} -ne 0; then
 fi
 
 # Download telecentroInfo from webservice
-if ! ${PREFIX}/bin/datasid-wget.sh 192.168.0.253/api/datasid -O ${DATADIR}/telecentroInfo; then
+if ! ${PREFIX}/bin/datasid-wget.sh 192.168.0.253/api/datasid -O ${DATADIR}/telecentroInfo -t 1; then
     date +"%F %T - Error while downloading telecentroInfo."
 #	exit 5
 else
@@ -172,7 +172,7 @@ fi
 rm -f ${DATADIR}/telecentroInfo
 
 # Check if telecentroInfo is configured
-if test -e ${CONFDIR}/telecentroInfo; then
+if ! test -f ${CONFDIR}/telecentroInfo; then
 	date +"%F %T - telecentroInfo not found in ${CONFDIR}/telecentroInfo, waiting configuration."
 	exit 8
 fi
diff --git a/agent/gen-scripts/collected-data/telecentro-info.tree b/agent/gen-scripts/collected-data/telecentro-info.tree
index 1d958921c466c513607bb31c735a29e95dd619f2..2b132065341312a995fe2f805dae52edc0d85da8 100755
--- a/agent/gen-scripts/collected-data/telecentro-info.tree
+++ b/agent/gen-scripts/collected-data/telecentro-info.tree
@@ -23,7 +23,7 @@
 export PREFIX="$(readlink -f "$(dirname $0)/../../")"
 
 # run datasid-common.sh
-bash "$(readlink -f "$(dirname $0)/../../")/bin/datasid-common.sh" || exit 1
+source "$(readlink -f "$(dirname $0)/../../")/bin/datasid-common.sh" || exit 1
 
 if test -z "${PREFIX}"; then
     exit 2
@@ -53,7 +53,7 @@ do
     collect=$(echo ${COLLECTDATA[$index]} | awk -F'=' '{print $2}')
 	value=$(cat ${CONFDIR}/telecentroInfo | grep $collect | awk -F'=' '{print $2}')
     # Check if the data exists
-    ! test -z '${value}' || exit $(($index + 2))
     index=$(($index + 1))
+    test -z ${value} && exit $(($index + 2))
     printf "<$tagName>$value</$tagName>"
 done
diff --git a/agent/gen-scripts/collected-data/user-history.tree b/agent/gen-scripts/collected-data/user-history.tree
index 43bb6aeac0479c638097f83b07e85a4628cdbc9c..4568db3dd4554c62ab0ec86cc37ad5d8921e0191 100755
--- a/agent/gen-scripts/collected-data/user-history.tree
+++ b/agent/gen-scripts/collected-data/user-history.tree
@@ -23,7 +23,7 @@
 export PREFIX="$(readlink -f "$(dirname $0)/../../")"
 
 # run datasid-common.sh
-bash "$(readlink -f "$(dirname $0)/../..")/bin/datasid-common.sh" || exit 1
+source "$(readlink -f "$(dirname $0)/../..")/bin/datasid-common.sh" || exit 1
 
 if test -z "${PREFIX}"; then
     exit 2
diff --git a/agent/network-scripts/net-collected-data/telecentro-id.tree b/agent/network-scripts/net-collected-data/telecentro-id.tree
index 00d548926ac347d572582177fdc74330c17ae507..85d36364876925ab05080ff794799c2c5e255adb 100755
--- a/agent/network-scripts/net-collected-data/telecentro-id.tree
+++ b/agent/network-scripts/net-collected-data/telecentro-id.tree
@@ -23,7 +23,7 @@
 export PREFIX="$(readlink -f "$(dirname $0)/../../")"
 
 # run datasid-common.sh
-bash "$(readlink -f "$(dirname $0)/../../")/bin/datasid-common.sh" || exit 1
+source "$(readlink -f "$(dirname $0)/../../")/bin/datasid-common.sh" || exit 1
 
 if test -z "${PREFIX}"; then
     exit 2
@@ -33,4 +33,7 @@ fi
 test -f ${CONFDIR}/telecentroInfo || exit 3
 
 # Collect telecentro id
-grep "datasid" ${CONFDIR}/telecentroInfo | awk -F'=' '{print $2}'
+SUPERID=$(grep "superid" ${CONFDIR}/telecentroInfo | awk -F'=' '{print $2}') 
+test -z ${SUPERID} && exit 4
+
+echo $SUPERID