diff --git a/manifests/config.pp b/manifests/config.pp
index 35fddad..e093cba 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -89,6 +89,7 @@
   file { $cache_dir: ensure => directory, }
 
   concat { '/etc/arc.conf': require => Package['nordugrid-arc-compute-element'],
+    notify => Service['a-rex'],
   }
 
   concat::fragment { 'arc.conf_common':
@@ -138,15 +139,15 @@
     '/etc/arc/',
     '/etc/arc/runtime/',
     '/etc/arc/runtime/ENV']: ensure => directory, }
-  
+
  # Create empty ATLAS-SITE-LCG  for ATLAS prd jobs
 
   file { [ '/etc/arc/runtime/APPS',
            '/etc/arc/runtime/APPS/HEP',] :
          ensure => directory,
          require => File['/etc/arc/runtime'],
-       } 
-  
+       }
+
   file { '/etc/arc/runtime/APPS/HEP/ATLAS-SITE-LCG':
       ensure  => present,
       source  => "puppet:///modules/${module_name}/RTEs/ATLAS-SITE-LCG",
@@ -154,8 +155,8 @@
       mode   => 755,
     }
 
-  
- 
+
+
   # plugin to set a default runtime environment
   file { '/usr/local/bin/default_rte_plugin.py':
     ensure => present,
diff --git a/templates/common.erb b/templates/common.erb
index 7450da1..80485d3 100644
--- a/templates/common.erb
+++ b/templates/common.erb
@@ -1,11 +1,11 @@
 [common]
-hostname="<%= fqdn %>"
-globus_tcp_port_range="<%= globus_port_range.join(',') %>"
-globus_udp_port_range="<%= globus_port_range.join(',') %>"
+hostname="<%= @fqdn %>"
+globus_tcp_port_range="<%= @globus_port_range.join(',') %>"
+globus_udp_port_range="<%= @globus_port_range.join(',') %>"
 
 x509_user_key="/etc/grid-security/hostkey.pem"
 x509_user_cert="/etc/grid-security/hostcert.pem"
 x509_cert_dir="/etc/grid-security/certificates"
 gridmap="/etc/grid-security/local-grid-mapfile"
-lrms="<%= lrms %>"
+lrms="<%= @lrms %>"
 
diff --git a/templates/grid-manager.erb b/templates/grid-manager.erb
index 39699b9..c6bafd8 100644
--- a/templates/grid-manager.erb
+++ b/templates/grid-manager.erb
@@ -9,37 +9,40 @@ debug="5"
 <% else -%>
 debug="3"
 <%end -%>
-logfile="<%= log_directory %>/grid-manager.log"
-pidfile="<%= run_directory %>/grid-manager.pid"
+logfile="<%= @log_directory %>/grid-manager.log"
+pidfile="<%= @run_directory %>/grid-manager.pid"
 mail="<%= mail %>"
-joblog="<%= log_directory %>/gm-jobs.log"
+joblog="<%= @log_directory %>/gm-jobs.log"
 shared_filesystem="no"
 max_job_control_requests=-1
 max_infosys_requests=-1
 wakeupperiod="180"
 defaultttl="345600 432000"
 runtimedir="/etc/arc/runtime"
+
 <%if @benchmark_type == 'HEPSPEC' -%>
-<% if @apel_testing == true -%>
-jobreport="APEL:http://test-msg02.afroditi.hellasgrid.gr:6163"
-jobreport_options="urbatch:50,archiving:/var/run/arc/urs,topic:/queue/global.accounting.cputest.CENTRAL,gocdb_name:<%= domain_name %>,use_ssl:false,Network:TEST-NWOB,benchmark_type:HEPSPEC,benchmark_value:<%= hepspec_per_core %>,benchmark_description:HS06"
-<% else -%>
-jobreport="APEL:https://mq.cro-ngi.hr:6162"
-jobreport_options="urbatch:<%= @apel_urbatch %>,archiving:/var/run/arc/urs,topic:/queue/global.accounting.cpu.central,gocdb_name:<%= domain_name %>,use_ssl:true,Network:PROD,benchmark_type:HEPSPEC,benchmark_value:<%= hepspec_per_core %>,benchmark_description:HS06"
-<%end -%>
-<%elsif @benchmark_type == 'Si2k' -%>
-<% if @apel_testing == true -%>
-jobreport="APEL:http://test-msg02.afroditi.hellasgrid.gr:6163"
-jobreport_options="urbatch:50,archiving:/var/run/arc/urs,topic:/queue/global.accounting.cputest.CENTRAL,gocdb_name:<%= domain_name %>,use_ssl:false,Network:TEST-NWOB,benchmark_type:Si2k,benchmark_value:<%= @cpu_scaling_reference_si00 %>,benchmark_description:Si2k"
-<% else -%>
-jobreport="APEL:https://mq.cro-ngi.hr:6162"
-jobreport_options="urbatch:<%= @apel_urbatch %>,archiving:/var/run/arc/urs,topic:/queue/global.accounting.cpu.central,gocdb_name:<%= domain_name %>,use_ssl:true,Network:PROD,benchmark_type:Si2k,benchmark_value:<%= @cpu_scaling_reference_si00 %>,benchmark_description:Si2k"
-<%end -%>
-<%end -%>
+<%- bench='HEPSPEC' -%>
+<%- bench_val=@hepspec_per_core -%>
+<%- bench_desc='HS06'-%>
+<%- else -%>
+<%- bench='Si2k' -%>
+<%- bench_val=@cpu_scaling_reference_si00 -%>
+<%- bench_desc='Si2k'-%>
+<%- end -%>
+
+<%- if @apel_testing == true -%>
+<%- stomp_conf='topic:/queue/global.accounting.cputest.CENTRAL,use_ssl:false,Network:TEST-NWOB' -%>
+<%- broker='APEL:http://test-msg02.afroditi.hellasgrid.gr:6163'-%>
+<%- else -%>
+<%- stomp_conf='topic:/queue/global.accounting.cpu.central,use_ssl:true,Network:PROD' -%>
+<%- broker='APEL:https://mq.cro-ngi.hr:6162'-%>
+<%- end -%>
+jobreport="<%= broker %>"
+jobreport_options="urbatch:<%= @apel_urbatch %>,archiving:<%= @accounting_archives %>,gocdb_name:<%= @domain_name %>,<%= stomp_conf %>,benchmark_type:<%= bench %>,benchmark_value:<%= bench_val %>,benchmark_description:<%= bench_desc %>"
 jobreport_credentials="/etc/grid-security/hostkey.pem /etc/grid-security/hostcert.pem /etc/grid-security/certificates"
 jobreport_publisher="jura"
 # web service
-#arex_mount_point="https://<%= fqdn %>:<%= arex_port %>/arex"
+#arex_mount_point="https://<%= @fqdn %>:<%= @arex_port %>/arex"
 #enable_emies_interface=yes
 
 # sets a default run time environment (RTE)
diff --git a/templates/gridftpd.erb b/templates/gridftpd.erb
index 13367f7..018a6b6 100644
--- a/templates/gridftpd.erb
+++ b/templates/gridftpd.erb
@@ -5,8 +5,8 @@ debug="5"
 <% else -%>
 debug="3"
 <%end -%>
-logfile="<%= log_directory %>/gridftpd.log"
-pidfile="<%= run_directory %>/gridftpd.pid"
+logfile="<%= @log_directory %>/gridftpd.log"
+pidfile="<%= @run_directory %>/gridftpd.pid"
 port="2811"
 allowunknown="yes"
 
diff --git a/templates/infosys.erb b/templates/infosys.erb
index c28f71a..f4c0ad6 100644
--- a/templates/infosys.erb
+++ b/templates/infosys.erb
@@ -12,8 +12,8 @@ slapd_loglevel="0"
 threads="32"
 timelimit="1800"
 infoproviders_timeout="1200"
-registrationlog="<%= log_directory %>/inforegistration.log"
-providerlog="<%= log_directory %>/infoprovider.log"
+registrationlog="<%= @log_directory %>/inforegistration.log"
+providerlog="<%= @log_directory %>/infoprovider.log"
 provider_loglevel="3"
 bdii_delete_delay=0
 <%if @enable_glue2 == true then -%>
@@ -32,22 +32,22 @@ bdii_run_dir="/var/run/arc/bdii"
 <%if @enable_glue1 == true then -%>
 ##TODO: add them to config parameters
 [infosys/glue12]
-resource_location="<%= resource_location %>"
-resource_latitude=<%= resource_latitude %>
-resource_longitude=<%= resource_longitude %>
-cpu_scaling_reference_si00=<%= cpu_scaling_reference_si00 %>
-processor_other_description="Cores=<%= @cores_per_worker %>,Benchmark=<%= hepspec_per_core %>-HEP-SPEC06"
-glue_site_web="<%= glue_site_web %>"
-glue_site_unique_id="<%= domain_name %>"
+resource_location="<%= @resource_location %>"
+resource_latitude=<%= @resource_latitude %>
+resource_longitude=<%= @resource_longitude %>
+cpu_scaling_reference_si00=<%= @cpu_scaling_reference_si00 %>
+processor_other_description="Cores=<%= @cores_per_worker %>,Benchmark=<%= @hepspec_per_core %>-HEP-SPEC06"
+glue_site_web="<%= @glue_site_web %>"
+glue_site_unique_id="<%= @domain_name %>"
 provide_glue_site_info="false"
 
 [infosys/site/sitename]
-unique_id="<%= fqdn %>"
+unique_id="<%= @fqdn %>"
 url="ldap://localhost:2135/mds-vo-name=resource,o=grid"
 <% end -%>
 
 [infosys/admindomain]
-name="<%= domain_name %>"
+name="<%= @domain_name %>"
 
 #cluster registration block
 <% @infosys_registration.keys.sort.each do |key| -%>
diff --git a/templates/lcmaps.db.erb b/templates/lcmaps.db.erb
index 23ee12e..b57f698 100644
--- a/templates/lcmaps.db.erb
+++ b/templates/lcmaps.db.erb
@@ -6,7 +6,7 @@ verify_proxy = "lcmaps_verify_proxy.mod"
                     "--allow-limited-proxy"
  
 pepc = "lcmaps_c_pep.mod"
-            "--pep-daemon-endpoint-url https://<%= argus_server %>:8154/authz"
+            "--pep-daemon-endpoint-url https://<%= @argus_server %>:8154/authz"
             "--resourceid http://authz-interop.org/xacml/resource/resource-type/arc"
             "--actionid http://glite.org/xacml/action/execute"
             "--capath /etc/grid-security/certificates/"
diff --git a/templates/queue.erb b/templates/queue.erb
index aa7e5e6..1d3ecd1 100644
--- a/templates/queue.erb
+++ b/templates/queue.erb
@@ -11,26 +11,26 @@ condor_requirements="<%= @condor_requirements -%>"
 architecture="adotf"
 
 #For inhomogenious clusters
-nodecpu="<%= cluster_description['CPUModel'] %> @ <%= cluster_description['CPUClockSpeed'] %> MHz"
+nodecpu="<%= @cluster_description['CPUModel'] %> @ <%= @cluster_description['CPUClockSpeed'] %> MHz"
 nodememory="<%= @cluster_description['NodeMemory'] -%>"
 
-opsys="<%= cluster_description['OSName'] %>"
-opsys="<%= cluster_description['OSVersion'] %>"
-opsys="<%= cluster_description['OSVersionName'] %>"
+opsys="<%= @cluster_description['OSName'] %>"
+opsys="<%= @cluster_description['OSVersion'] %>"
+opsys="<%= @cluster_description['OSVersionName'] %>"
 
 #cluster description for infosys
-OSFamily="<%= cluster_description['OSFamily'] %>"
-#OSName="<%= cluster_description['OSName'] %>"
-#OSVersion="<%= cluster_description['OSVersion'] %>"
+OSFamily="<%= @cluster_description['OSFamily'] %>"
+#OSName="<%= @cluster_description['OSName'] %>"
+#OSVersion="<%= @cluster_description['OSVersion'] %>"
 
-CPUVendor="<%= cluster_description['CPUVendor'] %>"
-CPUClockSpeed="<%= cluster_description['CPUClockSpeed'] %>"
-CPUModel="<%= cluster_description['CPUModel'] %>"
+CPUVendor="<%= @cluster_description['CPUVendor'] %>"
+CPUClockSpeed="<%= @cluster_description['CPUClockSpeed'] %>"
+CPUModel="<%= @cluster_description['CPUModel'] %>"
 #benchmark results
 <% @benchmark_results.each do |val| -%>
 benchmark="<%= val %>"
 <% end -%>
 
-cpudistribution=<%= cluster_cpudistribution.join(',') %>
-totalcpus="<%= cluster_description['totalcpus'] %>"
+cpudistribution=<%= @cluster_cpudistribution.join(',') %>
+totalcpus="<%= @cluster_description['totalcpus'] %>"