diff --git a/TestON/JenkinsFile/CommonJenkinsFile.groovy b/TestON/JenkinsFile/CommonJenkinsFile.groovy
index 9c822b3..29a5862 100644
--- a/TestON/JenkinsFile/CommonJenkinsFile.groovy
+++ b/TestON/JenkinsFile/CommonJenkinsFile.groovy
@@ -84,15 +84,15 @@
 }
 
 def initGraphPaths(){
-    graphPaths.put( "trendIndividual", fileRelated.trendIndividual )
+    graphPaths.put( "trendIndividual", fileRelated.rScriptPaths[ "scripts" ][ "trendIndividual" ] )
     if ( category == "SR" ){
-        graphPaths.put( "saveDirectory", fileRelated.jenkinsWorkspace + "postjob-" + ( testStation - "TestStation-" - "s" ) + "/" )
+        graphPaths.put( "saveDirectory", fileRelated.workspaces[ "base" ] + "postjob-" + ( testStation - "TestStation-" - "s" ) + "/" )
     } else if ( category == "SRHA" ) {
-        graphPaths.put( "saveDirectory", fileRelated.jenkinsWorkspace + "postjob-Fabric" + "/" )
+        graphPaths.put( "saveDirectory", fileRelated.workspaces[ "Fabric" ] )
     } else if ( category == "SCPF" || category == "USECASE" ){
-        graphPaths.put( "saveDirectory", fileRelated.jenkinsWorkspace + "postjob-BM/" )
+        graphPaths.put( "saveDirectory", fileRelated.workspaces[ "BM" ] )
     } else {
-        graphPaths.put( "saveDirectory", fileRelated.jenkinsWorkspace + "postjob-VM/" )
+        graphPaths.put( "saveDirectory", fileRelated.workspaces[ "VM" ] )
     }
 }
 
diff --git a/TestON/JenkinsFile/MasterTrigger.groovy b/TestON/JenkinsFile/MasterTrigger.groovy
index b67fdfd..372efc6 100644
--- a/TestON/JenkinsFile/MasterTrigger.groovy
+++ b/TestON/JenkinsFile/MasterTrigger.groovy
@@ -141,9 +141,9 @@
 
 // init paths for the files and directories.
 def initGraphPaths(){
-    graphPaths.put( "histogramMultiple", fileRelated.histogramMultiple )
-    graphPaths.put( "pieMultiple", fileRelated.pieMultiple )
-    graphPaths.put( "saveDirectory", fileRelated.jenkinsWorkspace + "postjob-VM/" )
+    graphPaths.put( "histogramMultiple", fileRelated.rScriptPaths[ "scripts" ][ "histogramMultiple" ] )
+    graphPaths.put( "pieMultiple", fileRelated.rScriptPaths[ "scripts" ][ "pieMultiple" ] )
+    graphPaths.put( "saveDirectory", fileRelated.workspaces[ "VM" ] )
 }
 
 // **********************
diff --git a/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy b/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy
index 9656e71..4735988 100644
--- a/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy
+++ b/TestON/JenkinsFile/dependencies/JenkinsCommonFuncs.groovy
@@ -58,8 +58,8 @@
 
     table_name = "executed_test_tests"
     result_name = "executed_test_results"
-    trend_generator_file = fileRelated.trendMultiple
-    build_stats_generator_file = fileRelated.histogramMultiple
+    trend_generator_file = fileRelated.rScriptPaths[ "scripts" ][ "trendMultiple" ]
+    build_stats_generator_file = fileRelated.rScriptPaths[ "scripts" ][ "histogramMultiple" ]
     isTrend = false
 }