diff --git a/defaults.inc b/defaults.inc
index fa2815a0..08a601aa 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -73,6 +73,13 @@ PW_SENSOR_ID['OFF-vMS-Host1']='10'
 # PW_SENSOR_ID['vMS-iDrac8']='12'
 
 declare -A PW_POWERSENSOR_ID
+PW_POWERSENSOR_ID['inv-in']='3'
+PW_POWERSENSOR_ID['inv-out']='4'
+PW_POWERSENSOR_ID['battery']='5'
+PW_POWERSENSOR_ID['total']='11'
+PW_POWERSENSOR_ID['server-rack']='12'
+PW_POWERSENSOR_ID['network-rack']='13'
+PW_POWERSENSOR_ID['offsite-ups']='15'
 PW_POWERSENSOR_ID['iDS-vMS-Host0']='20'
 PW_POWERSENSOR_ID['iDS-vMS-Host1']='20'
 PW_POWERSENSOR_ID['iDS-vMS-Host6']='26'
diff --git a/powerwall.sh b/powerwall.sh
index 9093c163..0bcf7b09 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -857,11 +857,11 @@ POWERLOGGER_SERVICE(){
 			BATTV=`echo ${INVSTATSINFO} | jq '.inputs .battV'`
 			BATTA=`echo ${INVSTATSINFO} | jq '.inputs .xfA'`
 			
-			QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('3','${LogDataTime}','${INPUTV}','${INPUTA}')"
+			QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('${PW_POWERSENSOR_ID['inv-in']}','${LogDataTime}','${INPUTV}','${INPUTA}')"
 			${mysql_conn} -e "USE servermonitor; ${QRY}"
-			QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('4','${LogDataTime}','${OUTPUTV}','${OUTPUTA}','${OUTPUTW}')"
+			QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['inv-out']}','${LogDataTime}','${OUTPUTV}','${OUTPUTA}','${OUTPUTW}')"
 			${mysql_conn} -e "USE servermonitor; ${QRY}"
-			QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('5','${LogDataTime}','${BATTV}','${BATTA}')"
+			QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('${PW_POWERSENSOR_ID['battery']}','${LogDataTime}','${BATTV}','${BATTA}')"
 			${mysql_conn} -e "USE servermonitor; ${QRY}"
 			
 			QRY="INSERT INTO inv_jsonstats (\`date\`, \`data\`) VALUES ('${LogDataTime}','${INVSTATSINFO}')"
@@ -875,7 +875,7 @@ POWERLOGGER_SERVICE(){
 			SVRRM_AMP=$(snmpwalk -v 1 -c public ${PW_UPS_IP} iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.3.1.1 | sed 's/.*: //')
 			SVRRM_AMP=`echo "scale=2; ${SVRRM_AMP}/100" | bc`
 			
-			QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('11','${LogDataTime}','${SVRRM_VOLT}','${SVRRM_AMP}','${SVRRM_WATT}')"
+			QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['total']}','${LogDataTime}','${SVRRM_VOLT}','${SVRRM_AMP}','${SVRRM_WATT}')"
 			${mysql_conn} -e "USE servermonitor; ${QRY}"
 		fi
 
@@ -884,7 +884,7 @@ POWERLOGGER_SERVICE(){
 			APCPDU_AMP=`echo "scale=1; ${APCPDU_AMP}/10" | bc`
 			if [ "${SVRRM_VOLT}" != "" ]; then
 				APCPDU_WATT=`echo "scale=1; ${APCPDU_AMP}*${SVRRM_VOLT}" | bc`
-				QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('12','${LogDataTime}','${SVRRM_VOLT}','${APCPDU_AMP}','${APCPDU_WATT}')"
+				QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['server-rack']}','${LogDataTime}','${SVRRM_VOLT}','${APCPDU_AMP}','${APCPDU_WATT}')"
 			else
 				QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`amp\`) VALUES ('12','${LogDataTime}','${APCPDU_AMP}')"
 			fi
@@ -895,7 +895,7 @@ POWERLOGGER_SERVICE(){
 			NETRK_AMP=`echo "scale=1; ${SVRRM_AMP}-${APCPDU_AMP}" | bc`
 			NETRK_WATT=`echo "scale=0; ${SVRRM_WATT}-${APCPDU_WATT}" | bc`
 			
-			QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('13','${LogDataTime}','${SVRRM_VOLT}','${NETRK_AMP}','${NETRK_WATT}')"
+			QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['network-rack']}','${LogDataTime}','${SVRRM_VOLT}','${NETRK_AMP}','${NETRK_WATT}')"
 			${mysql_conn} -e "USE servermonitor; ${QRY}"
 		fi
 		
@@ -907,7 +907,7 @@ POWERLOGGER_SERVICE(){
 			OFFSITE_WATTS=`echo "scale=2; ${OFFSITE_LOAD}*$(echo "${upsinfo}" | grep 'ups.realpower.nominal:' | sed 's/.*: //')" | bc`
 			OFFSITE_AMPS=`echo "scale=2; ${OFFSITE_WATTS}/${OFFSITE_VOLTOUT}" | bc`
 			
-			QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('15','${LogDataTime}','${OFFSITE_VOLTOUT}','${OFFSITE_AMPS}','${OFFSITE_WATTS}')"
+			QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['offsite-ups']}','${LogDataTime}','${OFFSITE_VOLTOUT}','${OFFSITE_AMPS}','${OFFSITE_WATTS}')"
 			${mysql_conn} -e "USE servermonitor; ${QRY}"
 		fi