diff --git a/projects/rdc/docs/RDC_API_Manual.pdf b/projects/rdc/docs/RDC_API_Manual.pdf
index 8f7cd451a1..111f160622 100644
Binary files a/projects/rdc/docs/RDC_API_Manual.pdf and b/projects/rdc/docs/RDC_API_Manual.pdf differ
diff --git a/projects/rdc/include/rdc/rdc.h b/projects/rdc/include/rdc/rdc.h
index 09bf726dac..2d33294dfe 100755
--- a/projects/rdc/include/rdc/rdc.h
+++ b/projects/rdc/include/rdc/rdc.h
@@ -418,7 +418,7 @@ rdc_status_t rdc_disconnect(rdc_handle_t p_rdc_handle);
  *  @retval ::RDC_ST_OK is returned upon successful call.
  */
 rdc_status_t rdc_job_start_stats(rdc_handle_t p_rdc_handle,
-    rdc_gpu_group_t group_id, char job_id[64], uint64_t update_freq);
+    rdc_gpu_group_t group_id, const char job_id[64], uint64_t update_freq);
 
 /**
  *  @brief Get the stats of the job using the job id.
@@ -435,8 +435,8 @@ rdc_status_t rdc_job_start_stats(rdc_handle_t p_rdc_handle,
  *
  *  @retval ::RDC_ST_OK is returned upon successful call.
  */
-rdc_status_t rdc_job_get_stats(rdc_handle_t p_rdc_handle, char  job_id[64],
-                rdc_job_info_t* p_job_info);
+rdc_status_t rdc_job_get_stats(rdc_handle_t p_rdc_handle,
+                           const char job_id[64], rdc_job_info_t* p_job_info);
 
 /**
  *  @brief Request RDC to stop watching the stats of the job
@@ -452,7 +452,7 @@ rdc_status_t rdc_job_get_stats(rdc_handle_t p_rdc_handle, char  job_id[64],
  *  @retval ::RDC_ST_OK is returned upon successful call.
  */
 rdc_status_t rdc_job_stop_stats(rdc_handle_t p_rdc_handle,
-            char  job_id[64]);
+                                                       const char job_id[64]);
 
 /**
  *  @brief Request RDC to stop tracking the job given by job_id
@@ -467,8 +467,7 @@ rdc_status_t rdc_job_stop_stats(rdc_handle_t p_rdc_handle,
  *
  *  @retval ::RDC_ST_OK is returned upon successful call.
  */
-rdc_status_t rdc_job_remove(rdc_handle_t p_rdc_handle,
-            char  job_id[64]);
+rdc_status_t rdc_job_remove(rdc_handle_t p_rdc_handle, const char job_id[64]);
 
 /**
  *  @brief Request RDC to stop tracking all the jobs
diff --git a/projects/rdc/include/rdc_lib/RdcCacheManager.h b/projects/rdc/include/rdc_lib/RdcCacheManager.h
index 0883bf8f7f..0052639d26 100644
--- a/projects/rdc/include/rdc_lib/RdcCacheManager.h
+++ b/projects/rdc/include/rdc_lib/RdcCacheManager.h
@@ -46,18 +46,18 @@ class RdcCacheManager {
                 uint64_t max_keep_samples, double  max_keep_age) = 0;
     virtual std::string  get_cache_stats() = 0;
 
-    virtual rdc_status_t rdc_job_get_stats(char jobId[64],
+    virtual rdc_status_t rdc_job_get_stats(const char job_id[64],
         const rdc_gpu_gauges_t& gpu_gauges,
         rdc_job_info_t* p_job_info) = 0;
-    virtual rdc_status_t rdc_job_start_stats(char jobId[64],
+    virtual rdc_status_t rdc_job_start_stats(const char job_id[64],
         const rdc_group_info_t& group,
         const rdc_field_group_info_t& finfo,
         const rdc_gpu_gauges_t& gpu_gauges) = 0;
-    virtual rdc_status_t rdc_job_stop_stats(char job_id[64],
+    virtual rdc_status_t rdc_job_stop_stats(const char job_id[64],
                 const rdc_gpu_gauges_t& gpu_gauge) = 0;
     virtual rdc_status_t rdc_update_job_stats(uint32_t gpu_index,
         const std::string& job_id, const rdc_field_value& value) = 0;
-    virtual rdc_status_t rdc_job_remove(char job_id[64]) = 0;
+    virtual rdc_status_t rdc_job_remove(const char job_id[64]) = 0;
     virtual rdc_status_t rdc_job_remove_all() = 0;
 
     virtual ~RdcCacheManager() {}
diff --git a/projects/rdc/include/rdc_lib/RdcHandler.h b/projects/rdc/include/rdc_lib/RdcHandler.h
index c5071bafaa..a89a9a8e89 100644
--- a/projects/rdc/include/rdc_lib/RdcHandler.h
+++ b/projects/rdc/include/rdc_lib/RdcHandler.h
@@ -33,11 +33,11 @@ class RdcHandler {
  public:
     // Job API
     virtual rdc_status_t rdc_job_start_stats(rdc_gpu_group_t groupId,
-                char job_id[64], uint64_t update_freq) = 0;
-    virtual rdc_status_t rdc_job_get_stats(char jobId[64],
+                             const char job_id[64], uint64_t update_freq) = 0;
+    virtual rdc_status_t rdc_job_get_stats(const char jobId[64],
                 rdc_job_info_t* p_job_info)= 0;
-    virtual rdc_status_t rdc_job_stop_stats(char job_id[64]) = 0;
-    virtual rdc_status_t rdc_job_remove(char job_id[64]) = 0;
+    virtual rdc_status_t rdc_job_stop_stats(const char job_id[64]) = 0;
+    virtual rdc_status_t rdc_job_remove(const char job_id[64]) = 0;
     virtual rdc_status_t rdc_job_remove_all() = 0;
 
     // Discovery API
diff --git a/projects/rdc/include/rdc_lib/RdcWatchTable.h b/projects/rdc/include/rdc_lib/RdcWatchTable.h
index 4adb2c39b7..1597f73011 100644
--- a/projects/rdc/include/rdc_lib/RdcWatchTable.h
+++ b/projects/rdc/include/rdc_lib/RdcWatchTable.h
@@ -36,11 +36,11 @@ class RdcWatchTable {
     virtual rdc_status_t rdc_field_update_all() = 0;
 
     virtual rdc_status_t rdc_job_start_stats(rdc_gpu_group_t group_id,
-                char job_id[64], uint64_t update_freq,
+                const char job_id[64], uint64_t update_freq,
                 const rdc_gpu_gauges_t& gpu_gauge) = 0;
-    virtual rdc_status_t rdc_job_stop_stats(char job_id[64],
+    virtual rdc_status_t rdc_job_stop_stats(const char job_id[64],
                 const rdc_gpu_gauges_t& gpu_gauge) = 0;
-    virtual rdc_status_t rdc_job_remove(char job_id[64]) = 0;
+    virtual rdc_status_t rdc_job_remove(const char job_id[64]) = 0;
     virtual rdc_status_t rdc_job_remove_all() = 0;
 
     virtual rdc_status_t rdc_field_watch(rdc_gpu_group_t group_id,
diff --git a/projects/rdc/include/rdc_lib/impl/RdcCacheManagerImpl.h b/projects/rdc/include/rdc_lib/impl/RdcCacheManagerImpl.h
index f8bf9d9ebd..2a16fa671a 100644
--- a/projects/rdc/include/rdc_lib/impl/RdcCacheManagerImpl.h
+++ b/projects/rdc/include/rdc_lib/impl/RdcCacheManagerImpl.h
@@ -81,19 +81,19 @@ class RdcCacheManagerImpl: public RdcCacheManager {
                 uint64_t max_keep_samples, double  max_keep_age) override;
     std::string  get_cache_stats()  override;
 
-    rdc_status_t rdc_job_get_stats(char  job_id[64],
+    rdc_status_t rdc_job_get_stats(const char job_id[64],
         const rdc_gpu_gauges_t& gpu_gauges,
         rdc_job_info_t* p_job_info) override;
-    rdc_status_t rdc_job_start_stats(char job_id[64],
+    rdc_status_t rdc_job_start_stats(const char job_id[64],
         const rdc_group_info_t& group,
         const rdc_field_group_info_t& finfo,
         const rdc_gpu_gauges_t& gpu_gauges) override;
-    rdc_status_t rdc_job_stop_stats(char job_id[64],
+    rdc_status_t rdc_job_stop_stats(const char job_id[64],
                     const rdc_gpu_gauges_t& gpu_gauge) override;
     rdc_status_t rdc_update_job_stats(uint32_t gpu_index,
         const std::string& job_id,
         const rdc_field_value& value) override;
-    rdc_status_t rdc_job_remove(char job_id[64]) override;
+    rdc_status_t rdc_job_remove(const char job_id[64]) override;
     rdc_status_t rdc_job_remove_all() override;
 
  private:
diff --git a/projects/rdc/include/rdc_lib/impl/RdcEmbeddedHandler.h b/projects/rdc/include/rdc_lib/impl/RdcEmbeddedHandler.h
index cb440f1c16..2b09664c15 100644
--- a/projects/rdc/include/rdc_lib/impl/RdcEmbeddedHandler.h
+++ b/projects/rdc/include/rdc_lib/impl/RdcEmbeddedHandler.h
@@ -37,11 +37,11 @@ class RdcEmbeddedHandler: public RdcHandler {
  public:
     // Job API
     rdc_status_t rdc_job_start_stats(rdc_gpu_group_t groupId,
-                char job_id[64], uint64_t update_freq) override;
-    rdc_status_t rdc_job_get_stats(char jobId[64],
+                        const char job_id[64], uint64_t update_freq) override;
+    rdc_status_t rdc_job_get_stats(const char jobId[64],
                 rdc_job_info_t* p_job_info) override;
-    rdc_status_t rdc_job_stop_stats(char job_id[64]) override;
-    rdc_status_t rdc_job_remove(char job_id[64]) override;
+    rdc_status_t rdc_job_stop_stats(const char job_id[64]) override;
+    rdc_status_t rdc_job_remove(const char job_id[64]) override;
     rdc_status_t rdc_job_remove_all() override;
 
     // Discovery API
diff --git a/projects/rdc/include/rdc_lib/impl/RdcStandaloneHandler.h b/projects/rdc/include/rdc_lib/impl/RdcStandaloneHandler.h
index 8573828213..30267ee9ac 100644
--- a/projects/rdc/include/rdc_lib/impl/RdcStandaloneHandler.h
+++ b/projects/rdc/include/rdc_lib/impl/RdcStandaloneHandler.h
@@ -33,11 +33,11 @@ class RdcStandaloneHandler: public RdcHandler {
  public:
     // Job RdcAPI
     rdc_status_t rdc_job_start_stats(rdc_gpu_group_t groupId,
-                char job_id[64], uint64_t update_freq) override;
-    rdc_status_t rdc_job_get_stats(char jobId[64],
+                        const char job_id[64], uint64_t update_freq) override;
+    rdc_status_t rdc_job_get_stats(const char jobId[64],
                 rdc_job_info_t* p_job_info) override;
-    rdc_status_t rdc_job_stop_stats(char job_id[64]) override;
-    rdc_status_t rdc_job_remove(char job_id[64]) override;
+    rdc_status_t rdc_job_stop_stats(const char job_id[64]) override;
+    rdc_status_t rdc_job_remove(const char job_id[64]) override;
     rdc_status_t rdc_job_remove_all() override;
 
     // Discovery RdcAPI
diff --git a/projects/rdc/include/rdc_lib/impl/RdcWatchTableImpl.h b/projects/rdc/include/rdc_lib/impl/RdcWatchTableImpl.h
index 15977f2a59..894860f562 100644
--- a/projects/rdc/include/rdc_lib/impl/RdcWatchTableImpl.h
+++ b/projects/rdc/include/rdc_lib/impl/RdcWatchTableImpl.h
@@ -54,11 +54,11 @@ struct JobWatchTableEntry {
 class RdcWatchTableImpl : public RdcWatchTable {
  public:
     rdc_status_t rdc_job_start_stats(rdc_gpu_group_t group_id,
-                    char job_id[64], uint64_t update_freq,
+                    const char job_id[64], uint64_t update_freq,
                     const rdc_gpu_gauges_t& gpu_gauge) override;
-    rdc_status_t rdc_job_stop_stats(char job_id[64],
+    rdc_status_t rdc_job_stop_stats(const char job_id[64],
                     const rdc_gpu_gauges_t& gpu_gauge) override;
-    rdc_status_t rdc_job_remove(char job_id[64]) override;
+    rdc_status_t rdc_job_remove(const char job_id[64]) override;
     rdc_status_t rdc_job_remove_all() override;
 
     rdc_status_t rdc_field_watch(rdc_gpu_group_t group_id,
diff --git a/projects/rdc/rdc_libs/bootstrap/src/RdcBootStrap.cc b/projects/rdc/rdc_libs/bootstrap/src/RdcBootStrap.cc
index d09bf8abf5..e078827fa2 100644
--- a/projects/rdc/rdc_libs/bootstrap/src/RdcBootStrap.cc
+++ b/projects/rdc/rdc_libs/bootstrap/src/RdcBootStrap.cc
@@ -112,8 +112,8 @@ rdc_status_t rdc_field_update_all(rdc_handle_t p_rdc_handle,
                 rdc_field_update_all(wait_for_update);
 }
 
-rdc_status_t rdc_job_get_stats(rdc_handle_t p_rdc_handle, char  job_id[64] ,
-                rdc_job_info_t* p_job_info) {
+rdc_status_t rdc_job_get_stats(rdc_handle_t p_rdc_handle,
+                          const char job_id[64], rdc_job_info_t* p_job_info) {
         if (!p_rdc_handle) {
                 return RDC_ST_INVALID_HANDLER;
         }
@@ -123,7 +123,7 @@ rdc_status_t rdc_job_get_stats(rdc_handle_t p_rdc_handle, char  job_id[64] ,
 }
 
 rdc_status_t rdc_job_start_stats(rdc_handle_t p_rdc_handle,
-                rdc_gpu_group_t groupId, char  job_id[64],
+                               rdc_gpu_group_t groupId, const char job_id[64],
                  uint64_t update_freq) {
         if (!p_rdc_handle) {
                 return RDC_ST_INVALID_HANDLER;
@@ -133,7 +133,7 @@ rdc_status_t rdc_job_start_stats(rdc_handle_t p_rdc_handle,
                 rdc_job_start_stats(groupId, job_id, update_freq);
 }
 
-rdc_status_t rdc_job_remove(rdc_handle_t p_rdc_handle, char job_id[64]) {
+rdc_status_t rdc_job_remove(rdc_handle_t p_rdc_handle, const char job_id[64]) {
         if (!p_rdc_handle) {
                 return RDC_ST_INVALID_HANDLER;
         }
@@ -152,7 +152,8 @@ rdc_status_t rdc_job_remove_all(rdc_handle_t p_rdc_handle) {
 }
 
 
-rdc_status_t rdc_job_stop_stats(rdc_handle_t p_rdc_handle, char  job_id[64] ) {
+rdc_status_t rdc_job_stop_stats(rdc_handle_t p_rdc_handle,
+                                                     const char job_id[64] ) {
         if (!p_rdc_handle) {
                 return RDC_ST_INVALID_HANDLER;
         }
diff --git a/projects/rdc/rdc_libs/rdc/src/RdcCacheManagerImpl.cc b/projects/rdc/rdc_libs/rdc/src/RdcCacheManagerImpl.cc
index 22cc2257fc..110529bef8 100644
--- a/projects/rdc/rdc_libs/rdc/src/RdcCacheManagerImpl.cc
+++ b/projects/rdc/rdc_libs/rdc/src/RdcCacheManagerImpl.cc
@@ -175,7 +175,7 @@ rdc_status_t RdcCacheManagerImpl::rdc_update_cache(uint32_t gpu_index,
     return RDC_ST_OK;
 }
 
-rdc_status_t RdcCacheManagerImpl::rdc_job_remove(char job_id[64]) {
+rdc_status_t RdcCacheManagerImpl::rdc_job_remove(const char job_id[64]) {
     std::lock_guard<std::mutex> guard(cache_mutex_);
     cache_jobs_.erase(job_id);
     return RDC_ST_OK;
@@ -250,7 +250,7 @@ void RdcCacheManagerImpl::set_summary(const FieldSummaryStats & stats,
     summary.average += gpu.average;
 }
 
-rdc_status_t RdcCacheManagerImpl::rdc_job_get_stats(char jobId[64],
+rdc_status_t RdcCacheManagerImpl::rdc_job_get_stats(const char jobId[64],
         const rdc_gpu_gauges_t& gpu_gauges,
         rdc_job_info_t* p_job_info) {
     std::lock_guard<std::mutex> guard(cache_mutex_);
@@ -384,7 +384,7 @@ rdc_status_t RdcCacheManagerImpl::rdc_job_get_stats(char jobId[64],
     return RDC_ST_OK;
 }
 
-rdc_status_t RdcCacheManagerImpl::rdc_job_start_stats(char job_id[64],
+rdc_status_t RdcCacheManagerImpl::rdc_job_start_stats(const char job_id[64],
         const rdc_group_info_t& ginfo, const rdc_field_group_info_t& finfo,
         const rdc_gpu_gauges_t& gpu_gauges) {
      RdcJobStatsCacheEntry cacheEntry;
@@ -426,7 +426,7 @@ rdc_status_t RdcCacheManagerImpl::rdc_job_start_stats(char job_id[64],
 }
 
 
-rdc_status_t RdcCacheManagerImpl::rdc_job_stop_stats(char job_id[64],
+rdc_status_t RdcCacheManagerImpl::rdc_job_stop_stats(const char job_id[64],
             const rdc_gpu_gauges_t& gpu_gauges) {
     std::lock_guard<std::mutex> guard(cache_mutex_);
     auto job_stats = cache_jobs_.find(job_id);
diff --git a/projects/rdc/rdc_libs/rdc/src/RdcEmbeddedHandler.cc b/projects/rdc/rdc_libs/rdc/src/RdcEmbeddedHandler.cc
index bd02f1b7d6..43d271f972 100644
--- a/projects/rdc/rdc_libs/rdc/src/RdcEmbeddedHandler.cc
+++ b/projects/rdc/rdc_libs/rdc/src/RdcEmbeddedHandler.cc
@@ -85,7 +85,7 @@ RdcEmbeddedHandler::~RdcEmbeddedHandler() {
 
 // JOB API
 rdc_status_t RdcEmbeddedHandler::rdc_job_start_stats(rdc_gpu_group_t groupId,
-        char job_id[64], uint64_t update_freq) {
+        const char job_id[64], uint64_t update_freq) {
     rdc_gpu_gauges_t gpu_gauges;
     rdc_status_t status = get_gpu_gauges(&gpu_gauges);
     if (status != RDC_ST_OK) return status;
@@ -136,7 +136,7 @@ rdc_status_t RdcEmbeddedHandler::get_gpu_gauges(rdc_gpu_gauges_t* gpu_gauges) {
     return RDC_ST_OK;
 }
 
-rdc_status_t RdcEmbeddedHandler::rdc_job_get_stats(char job_id[64],
+rdc_status_t RdcEmbeddedHandler::rdc_job_get_stats(const char job_id[64],
            rdc_job_info_t* p_job_info) {
     if (p_job_info == nullptr) {
         return RDC_ST_BAD_PARAMETER;
@@ -149,7 +149,7 @@ rdc_status_t RdcEmbeddedHandler::rdc_job_get_stats(char job_id[64],
     return cache_mgr_->rdc_job_get_stats(job_id, gpu_gauges, p_job_info);
 }
 
-rdc_status_t RdcEmbeddedHandler::rdc_job_stop_stats(char job_id[64]) {
+rdc_status_t RdcEmbeddedHandler::rdc_job_stop_stats(const char job_id[64]) {
     rdc_gpu_gauges_t gpu_gauges;
     rdc_status_t status = get_gpu_gauges(&gpu_gauges);
     if (status != RDC_ST_OK) return status;
@@ -157,7 +157,7 @@ rdc_status_t RdcEmbeddedHandler::rdc_job_stop_stats(char job_id[64]) {
     return watch_table_->rdc_job_stop_stats(job_id, gpu_gauges);
 }
 
-rdc_status_t RdcEmbeddedHandler::rdc_job_remove(char job_id[64]) {
+rdc_status_t RdcEmbeddedHandler::rdc_job_remove(const char job_id[64]) {
     return watch_table_->rdc_job_remove(job_id);
 }
 
diff --git a/projects/rdc/rdc_libs/rdc/src/RdcWatchTableImpl.cc b/projects/rdc/rdc_libs/rdc/src/RdcWatchTableImpl.cc
index 7ed2663ae6..2114e7b25a 100644
--- a/projects/rdc/rdc_libs/rdc/src/RdcWatchTableImpl.cc
+++ b/projects/rdc/rdc_libs/rdc/src/RdcWatchTableImpl.cc
@@ -41,7 +41,7 @@ RdcWatchTableImpl::RdcWatchTableImpl(const RdcGroupSettingsPtr& group_settings,
 }
 
 rdc_status_t  RdcWatchTableImpl::rdc_job_start_stats(rdc_gpu_group_t group_id,
-                char  job_id[64], uint64_t update_freq,
+                const char  job_id[64], uint64_t update_freq,
                 const rdc_gpu_gauges_t& gpu_gauges) {
     do {  //< lock guard for thread safe
         std::lock_guard<std::mutex> guard(watch_mutex_);
@@ -92,7 +92,7 @@ rdc_status_t  RdcWatchTableImpl::rdc_job_start_stats(rdc_gpu_group_t group_id,
     return result;
 }
 
-rdc_status_t RdcWatchTableImpl::rdc_job_stop_stats(char job_id[64],
+rdc_status_t RdcWatchTableImpl::rdc_job_stop_stats(const char job_id[64],
                         const rdc_gpu_gauges_t& gpu_gauge) {
     uint32_t job_group_id;
     do {  //< lock guard for thread safe
@@ -119,7 +119,7 @@ rdc_status_t RdcWatchTableImpl::rdc_job_stop_stats(char job_id[64],
     return result;
 }
 
-rdc_status_t RdcWatchTableImpl::rdc_job_remove(char job_id[64]) {
+rdc_status_t RdcWatchTableImpl::rdc_job_remove(const char job_id[64]) {
     rdc_gpu_gauges_t gpu_gauge;
     rdc_job_stop_stats(job_id, gpu_gauge);
     return cache_mgr_->rdc_job_remove(job_id);
diff --git a/projects/rdc/rdc_libs/rdc_client/src/RdcStandaloneHandler.cc b/projects/rdc/rdc_libs/rdc_client/src/RdcStandaloneHandler.cc
index 12d63318ef..b810f66d54 100644
--- a/projects/rdc/rdc_libs/rdc_client/src/RdcStandaloneHandler.cc
+++ b/projects/rdc/rdc_libs/rdc_client/src/RdcStandaloneHandler.cc
@@ -61,8 +61,8 @@ rdc_status_t RdcStandaloneHandler::error_handle(::grpc::Status status,
 }
 
 // JOB RdcAPI
-rdc_status_t RdcStandaloneHandler::rdc_job_start_stats(rdc_gpu_group_t groupId,
-        char job_id[64], uint64_t update_freq) {
+rdc_status_t RdcStandaloneHandler::rdc_job_start_stats(
+       rdc_gpu_group_t groupId, const char job_id[64], uint64_t update_freq) {
     ::rdc::StartJobStatsRequest request;
     ::rdc::StartJobStatsResponse reply;
     ::grpc::ClientContext context;
@@ -133,7 +133,7 @@ bool RdcStandaloneHandler::copy_gpu_usage_info(
 
     return true;
 }
-rdc_status_t RdcStandaloneHandler::rdc_job_get_stats(char job_id[64],
+rdc_status_t RdcStandaloneHandler::rdc_job_get_stats(const char job_id[64],
            rdc_job_info_t* p_job_info) {
     if (!p_job_info) {
         return RDC_ST_BAD_PARAMETER;
@@ -157,7 +157,7 @@ rdc_status_t RdcStandaloneHandler::rdc_job_get_stats(char job_id[64],
     return RDC_ST_OK;
 }
 
-rdc_status_t RdcStandaloneHandler::rdc_job_stop_stats(char job_id[64]) {
+rdc_status_t RdcStandaloneHandler::rdc_job_stop_stats(const char job_id[64]) {
     ::rdc::StopJobStatsRequest request;
     ::rdc::StopJobStatsResponse reply;
     ::grpc::ClientContext context;
@@ -169,7 +169,7 @@ rdc_status_t RdcStandaloneHandler::rdc_job_stop_stats(char job_id[64]) {
     return err_status;
 }
 
-rdc_status_t RdcStandaloneHandler::rdc_job_remove(char job_id[64]) {
+rdc_status_t RdcStandaloneHandler::rdc_job_remove(const char job_id[64]) {
     ::rdc::RemoveJobRequest request;
     ::rdc::RemoveJobResponse reply;
     ::grpc::ClientContext context;
diff --git a/projects/rdc/server/CMakeLists.txt b/projects/rdc/server/CMakeLists.txt
index d7164bdbe4..06b4817751 100755
--- a/projects/rdc/server/CMakeLists.txt
+++ b/projects/rdc/server/CMakeLists.txt
@@ -43,11 +43,18 @@ message("")
 
 set(SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
                    CACHE STRING "Location of RDC client library source code.")
-set(CMAKE_INSTALL_PREFIX ${RDC_SERVER_ROOT_PATH}
+
+message("CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
+message("CPACK_PACKAGING_INSTALL_PREFIX=${CPACK_PACKAGING_INSTALL_PREFIX}")
+if (NOT DEFINED CMAKE_INSTALL_PREFIX)
+  set(CMAKE_INSTALL_PREFIX ${RDC_SERVER_ROOT_PATH}
                                 CACHE STRING "Default installation directory.")
+endif()
+
+if (NOT DEFINED CPACK_PACKAGING_INSTALL_PREFIX)
 set(CPACK_PACKAGING_INSTALL_PREFIX ${RDC_SERVER_ROOT_PATH}
                                      CACHE STRING "Default packaging prefix.")
-
+endif()
 
 ## Compiler flags
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -m64")
@@ -57,9 +64,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -std=c++11 ")
 
 if ("${CMAKE_BUILD_TYPE}" STREQUAL Release)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
-else ()
+else()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb -O0 -DDEBUG")
-endif ()
+endif()
 
 set(SRC_DIR "src")
 set(INC_DIR "include/${RDC}")
@@ -98,11 +105,11 @@ target_link_libraries(${SERVER_DAEMON_EXE} pthread rt grpc grpc++
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SERVER_DAEMON_EXE}
         PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE GROUP_READ
         GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
-        DESTINATION ${RDC_SERVER_ROOT_PATH}usr/sbin
-                                            COMPONENT ${SERVER_COMPONENT})
+        DESTINATION usr/sbin
+        COMPONENT ${SERVER_COMPONENT})
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SERVICE_FILE_NAME}
-               DESTINATION ${RDC_SERVER_ROOT_PATH}lib/systemd/system
-                                           COMPONENT ${SERVER_COMPONENT})
+               DESTINATION lib/systemd/system
+               COMPONENT ${SERVER_COMPONENT})
 
 message("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&")
 message("                    Finished Cmake Server                          ")