diff --git a/data/variables.py b/data/variables.py
index 9c0e773..1146cab 100644
--- a/data/variables.py
+++ b/data/variables.py
@@ -1,5 +1,22 @@
 import os
 
+# Enable when ready with openbmc/openbmc-test-automation#203
+# replace with new path /xyz/openbmc_project
+OPENBMC_BASE_URI = '/org/openbmc/'
+OPENBMC_BASE_DBUS = 'org.openbmc'
+
+# REST URI base endpoint paths
+CONTROL_URI = OPENBMC_BASE_URI + 'control/'
+SENSORS_URI = OPENBMC_BASE_URI + 'sensors/'
+RECORDS_URI = OPENBMC_BASE_URI + 'records/'
+BUTTONS_URI = OPENBMC_BASE_URI + 'buttons/'
+SETTINGS_URI = OPENBMC_BASE_URI + 'settings/'
+WATCHDOG_URI = OPENBMC_BASE_URI + 'watchdog/'
+INVENTORY_URI = OPENBMC_BASE_URI + 'inventory/'
+USER_MANAGER_URI = OPENBMC_BASE_URI + 'UserManager/'
+NETWORK_MANAGER_URI = OPENBMC_BASE_URI + 'NetworkManager/'
+
+
 '''
   QEMU HTTPS variable:
 
@@ -8,26 +25,29 @@
   ${AUTH_SUFFIX} is populated here by default EMPTY else
   the port from the OS environment
 '''
+
+
 def get_port_https():
     # defaulted to empty string
     l_suffix = ''
     try:
         l_https_port = os.getenv('HTTPS_PORT')
         if l_https_port:
-           l_suffix = ':' + l_https_port
+            l_suffix = ':' + l_https_port
     except:
-        print "Environment variable HTTPS_PORT not set,using default HTTPS port"
+        print "Environment variable HTTPS_PORT not set,\
+              using default HTTPS port"
     return l_suffix
 
-AUTH_SUFFIX={
-    "https_port":[get_port_https()],
+AUTH_SUFFIX = {
+    "https_port": [get_port_https()],
 }
 
 # Update the ':Port number' to this variable
 AUTH_SUFFIX = AUTH_SUFFIX['https_port'][0]
 
 # Here contains a list of valid Properties bases on fru_type after a boot.
-INVENTORY_ITEMS={
+INVENTORY_ITEMS = {
     "CPU": [
         "Custom Field 1",
         "Custom Field 2",
diff --git a/lib/resource.txt b/lib/resource.txt
index 2d6cd3c..6845a55 100755
--- a/lib/resource.txt
+++ b/lib/resource.txt
@@ -38,10 +38,6 @@
 ${OS_PASSWORD}      ${EMPTY}
 ${OS_WAIT_TIMEOUT}  ${15*60}
 
-# OpenBMC base URI path is changing to /xyz/openbmc_project
-${OPENBMC_BASE_URI}    /org/openbmc/
-${OPENBMC_BASE_DBUS}   org.openbmc
-
 *** Keywords ***
 Get Inventory Schema
     [Arguments]    ${machine}