diff --git a/projects/rocprofiler/src/core/intercept_queue.h b/projects/rocprofiler/src/core/intercept_queue.h
index ac74cd4051..5a6234abcd 100644
--- a/projects/rocprofiler/src/core/intercept_queue.h
+++ b/projects/rocprofiler/src/core/intercept_queue.h
@@ -72,7 +72,7 @@ class InterceptQueue {
 
     if (tracker_on || tracker_on_) {
       if (tracker_ == NULL) tracker_ = &Tracker::Instance();
-      status = hsa_amd_profiling_set_profiler_enabled(*queue, true);
+      status = rocprofiler::util::HsaRsrcFactory::HsaApi()->hsa_amd_profiling_set_profiler_enabled(*queue, true);
       if (status != HSA_STATUS_SUCCESS) EXC_ABORT(status, "hsa_amd_profiling_set_profiler_enabled()");
     }
 
diff --git a/projects/rocprofiler/src/util/hsa_rsrc_factory.cpp b/projects/rocprofiler/src/util/hsa_rsrc_factory.cpp
index a141fe04c8..a47062ddd4 100644
--- a/projects/rocprofiler/src/util/hsa_rsrc_factory.cpp
+++ b/projects/rocprofiler/src/util/hsa_rsrc_factory.cpp
@@ -146,7 +146,7 @@ HsaRsrcFactory::HsaRsrcFactory(bool initialize_hsa) : initialize_hsa_(initialize
   CHECK_STATUS("loader API table query failed", status);
 
   // Instantiate HSA timer
-  timer_ = new HsaTimer;
+  timer_ = new HsaTimer(&hsa_api_);
   CHECK_STATUS("HSA timer allocation failed",
     (timer_ == NULL) ? HSA_STATUS_ERROR : HSA_STATUS_SUCCESS);
 
@@ -173,7 +173,6 @@ void HsaRsrcFactory::InitHsaApiTable(HsaApiTable* table) {
       hsa_api_.hsa_init = table->core_->hsa_init_fn;
       hsa_api_.hsa_shut_down = table->core_->hsa_shut_down_fn;
       hsa_api_.hsa_agent_get_info = table->core_->hsa_agent_get_info_fn;
-
       hsa_api_.hsa_iterate_agents = table->core_->hsa_iterate_agents_fn;
 
       hsa_api_.hsa_queue_create = table->core_->hsa_queue_create_fn;
@@ -181,14 +180,13 @@ void HsaRsrcFactory::InitHsaApiTable(HsaApiTable* table) {
       hsa_api_.hsa_queue_load_write_index_relaxed = table->core_->hsa_queue_load_write_index_relaxed_fn;
       hsa_api_.hsa_queue_store_write_index_relaxed = table->core_->hsa_queue_store_write_index_relaxed_fn;
       hsa_api_.hsa_queue_load_read_index_relaxed = table->core_->hsa_queue_load_read_index_relaxed_fn;
+
       hsa_api_.hsa_signal_create = table->core_->hsa_signal_create_fn;
       hsa_api_.hsa_signal_destroy = table->core_->hsa_signal_destroy_fn;
       hsa_api_.hsa_signal_load_relaxed = table->core_->hsa_signal_load_relaxed_fn;
       hsa_api_.hsa_signal_store_relaxed = table->core_->hsa_signal_store_relaxed_fn;
-      hsa_api_.hsa_signal_store_screlease = table->core_->hsa_signal_store_screlease_fn;
       hsa_api_.hsa_signal_wait_scacquire = table->core_->hsa_signal_wait_scacquire_fn;
-
-      hsa_api_.hsa_system_get_major_extension_table = table->core_->hsa_system_get_major_extension_table_fn;
+      hsa_api_.hsa_signal_store_screlease = table->core_->hsa_signal_store_screlease_fn;
 
       hsa_api_.hsa_code_object_reader_create_from_file = table->core_->hsa_code_object_reader_create_from_file_fn;
       hsa_api_.hsa_executable_create_alt = table->core_->hsa_executable_create_alt_fn;
@@ -196,21 +194,23 @@ void HsaRsrcFactory::InitHsaApiTable(HsaApiTable* table) {
       hsa_api_.hsa_executable_freeze = table->core_->hsa_executable_freeze_fn;
       hsa_api_.hsa_executable_get_symbol = table->core_->hsa_executable_get_symbol_fn;
 
+      hsa_api_.hsa_system_get_info = table->core_->hsa_system_get_info_fn;
+      hsa_api_.hsa_system_get_major_extension_table = table->core_->hsa_system_get_major_extension_table_fn;
+
       hsa_api_.hsa_amd_agent_iterate_memory_pools = table->amd_ext_->hsa_amd_agent_iterate_memory_pools_fn;
       hsa_api_.hsa_amd_memory_pool_get_info = table->amd_ext_->hsa_amd_memory_pool_get_info_fn;
       hsa_api_.hsa_amd_memory_pool_allocate = table->amd_ext_->hsa_amd_memory_pool_allocate_fn;
       hsa_api_.hsa_amd_agents_allow_access = table->amd_ext_->hsa_amd_agents_allow_access_fn;
-
       hsa_api_.hsa_amd_memory_async_copy = table->amd_ext_->hsa_amd_memory_async_copy_fn;
 
       hsa_api_.hsa_amd_signal_async_handler = table->amd_ext_->hsa_amd_signal_async_handler_fn;
+      hsa_api_.hsa_amd_profiling_set_profiler_enabled = table->amd_ext_->hsa_amd_profiling_set_profiler_enabled_fn;
       hsa_api_.hsa_amd_profiling_get_async_copy_time = table->amd_ext_->hsa_amd_profiling_get_async_copy_time_fn;
       hsa_api_.hsa_amd_profiling_get_dispatch_time = table->amd_ext_->hsa_amd_profiling_get_dispatch_time_fn;
     } else {
       hsa_api_.hsa_init = hsa_init;
       hsa_api_.hsa_shut_down = hsa_shut_down;
       hsa_api_.hsa_agent_get_info = hsa_agent_get_info;
-
       hsa_api_.hsa_iterate_agents = hsa_iterate_agents;
 
       hsa_api_.hsa_queue_create = hsa_queue_create;
@@ -218,19 +218,13 @@ void HsaRsrcFactory::InitHsaApiTable(HsaApiTable* table) {
       hsa_api_.hsa_queue_load_write_index_relaxed = hsa_queue_load_write_index_relaxed;
       hsa_api_.hsa_queue_store_write_index_relaxed = hsa_queue_store_write_index_relaxed;
       hsa_api_.hsa_queue_load_read_index_relaxed = hsa_queue_load_read_index_relaxed;
+
       hsa_api_.hsa_signal_create = hsa_signal_create;
       hsa_api_.hsa_signal_destroy = hsa_signal_destroy;
+      hsa_api_.hsa_signal_load_relaxed = hsa_signal_load_relaxed;
       hsa_api_.hsa_signal_store_relaxed = hsa_signal_store_relaxed;
       hsa_api_.hsa_signal_wait_scacquire = hsa_signal_wait_scacquire;
-
-      hsa_api_.hsa_amd_agent_iterate_memory_pools = hsa_amd_agent_iterate_memory_pools;
-      hsa_api_.hsa_amd_memory_pool_get_info = hsa_amd_memory_pool_get_info;
-      hsa_api_.hsa_amd_memory_pool_allocate = hsa_amd_memory_pool_allocate;
-      hsa_api_.hsa_amd_agents_allow_access = hsa_amd_agents_allow_access;
-
-      hsa_api_.hsa_amd_memory_async_copy = hsa_amd_memory_async_copy;
-
-      hsa_api_.hsa_system_get_major_extension_table = hsa_system_get_major_extension_table;
+      hsa_api_.hsa_signal_store_screlease = hsa_signal_store_screlease;
 
       hsa_api_.hsa_code_object_reader_create_from_file = hsa_code_object_reader_create_from_file;
       hsa_api_.hsa_executable_create_alt = hsa_executable_create_alt;
@@ -238,11 +232,19 @@ void HsaRsrcFactory::InitHsaApiTable(HsaApiTable* table) {
       hsa_api_.hsa_executable_freeze = hsa_executable_freeze;
       hsa_api_.hsa_executable_get_symbol = hsa_executable_get_symbol;
 
+      hsa_api_.hsa_system_get_info = hsa_system_get_info;
+      hsa_api_.hsa_system_get_major_extension_table = hsa_system_get_major_extension_table;
+
+      hsa_api_.hsa_amd_agent_iterate_memory_pools = hsa_amd_agent_iterate_memory_pools;
+      hsa_api_.hsa_amd_memory_pool_get_info = hsa_amd_memory_pool_get_info;
+      hsa_api_.hsa_amd_memory_pool_allocate = hsa_amd_memory_pool_allocate;
+      hsa_api_.hsa_amd_agents_allow_access = hsa_amd_agents_allow_access;
+      hsa_api_.hsa_amd_memory_async_copy = hsa_amd_memory_async_copy;
+
       hsa_api_.hsa_amd_signal_async_handler = hsa_amd_signal_async_handler;
+      hsa_api_.hsa_amd_profiling_set_profiler_enabled = hsa_amd_profiling_set_profiler_enabled;
       hsa_api_.hsa_amd_profiling_get_async_copy_time = hsa_amd_profiling_get_async_copy_time;
       hsa_api_.hsa_amd_profiling_get_dispatch_time = hsa_amd_profiling_get_dispatch_time;
-      hsa_api_.hsa_signal_load_relaxed = hsa_signal_load_relaxed;
-      hsa_api_.hsa_signal_store_screlease = hsa_signal_store_screlease;
     }
   }
 }
diff --git a/projects/rocprofiler/src/util/hsa_rsrc_factory.h b/projects/rocprofiler/src/util/hsa_rsrc_factory.h
index a1bc4b2eb5..f982ddde7b 100644
--- a/projects/rocprofiler/src/util/hsa_rsrc_factory.h
+++ b/projects/rocprofiler/src/util/hsa_rsrc_factory.h
@@ -75,7 +75,6 @@ struct hsa_pfn_t {
   decltype(hsa_init)* hsa_init;
   decltype(hsa_shut_down)* hsa_shut_down;
   decltype(hsa_agent_get_info)* hsa_agent_get_info;
-
   decltype(hsa_iterate_agents)* hsa_iterate_agents;
 
   decltype(hsa_queue_create)* hsa_queue_create;
@@ -83,18 +82,13 @@ struct hsa_pfn_t {
   decltype(hsa_queue_load_write_index_relaxed)* hsa_queue_load_write_index_relaxed;
   decltype(hsa_queue_store_write_index_relaxed)* hsa_queue_store_write_index_relaxed;
   decltype(hsa_queue_load_read_index_relaxed)* hsa_queue_load_read_index_relaxed;
+
   decltype(hsa_signal_create)* hsa_signal_create;
   decltype(hsa_signal_destroy)* hsa_signal_destroy;
+  decltype(hsa_signal_load_relaxed)* hsa_signal_load_relaxed;
   decltype(hsa_signal_store_relaxed)* hsa_signal_store_relaxed;
   decltype(hsa_signal_wait_scacquire)* hsa_signal_wait_scacquire;
-
-  decltype(hsa_amd_agent_iterate_memory_pools)* hsa_amd_agent_iterate_memory_pools;
-  decltype(hsa_amd_memory_pool_get_info)* hsa_amd_memory_pool_get_info;
-  decltype(hsa_amd_memory_pool_allocate)* hsa_amd_memory_pool_allocate;
-  decltype(hsa_amd_agents_allow_access)* hsa_amd_agents_allow_access;
-  decltype(hsa_amd_memory_async_copy)* hsa_amd_memory_async_copy;
-
-  decltype(hsa_system_get_major_extension_table)* hsa_system_get_major_extension_table;
+  decltype(hsa_signal_store_screlease)* hsa_signal_store_screlease;
 
   decltype(hsa_code_object_reader_create_from_file)* hsa_code_object_reader_create_from_file;
   decltype(hsa_executable_create_alt)* hsa_executable_create_alt;
@@ -102,11 +96,19 @@ struct hsa_pfn_t {
   decltype(hsa_executable_freeze)* hsa_executable_freeze;
   decltype(hsa_executable_get_symbol)* hsa_executable_get_symbol;
 
+  decltype(hsa_system_get_info)* hsa_system_get_info;
+  decltype(hsa_system_get_major_extension_table)* hsa_system_get_major_extension_table;
+
+  decltype(hsa_amd_agent_iterate_memory_pools)* hsa_amd_agent_iterate_memory_pools;
+  decltype(hsa_amd_memory_pool_get_info)* hsa_amd_memory_pool_get_info;
+  decltype(hsa_amd_memory_pool_allocate)* hsa_amd_memory_pool_allocate;
+  decltype(hsa_amd_agents_allow_access)* hsa_amd_agents_allow_access;
+  decltype(hsa_amd_memory_async_copy)* hsa_amd_memory_async_copy;
+
   decltype(hsa_amd_signal_async_handler)* hsa_amd_signal_async_handler;
+  decltype(hsa_amd_profiling_set_profiler_enabled)* hsa_amd_profiling_set_profiler_enabled;
   decltype(hsa_amd_profiling_get_async_copy_time)* hsa_amd_profiling_get_async_copy_time;
   decltype(hsa_amd_profiling_get_dispatch_time)* hsa_amd_profiling_get_dispatch_time;
-  decltype(hsa_signal_load_relaxed)* hsa_signal_load_relaxed;
-  decltype(hsa_signal_store_screlease)* hsa_signal_store_screlease;
 };
 
 // Encapsulates information about a Hsa Agent such as its
@@ -168,9 +170,9 @@ class HsaTimer {
   static const timestamp_t TIMESTAMP_MAX = UINT64_MAX;
   typedef long double freq_t;
 
-  HsaTimer() {
+  HsaTimer(const hsa_pfn_t* hsa_api) : hsa_api_(hsa_api) {
     timestamp_t sysclock_hz = 0;
-    hsa_status_t status = hsa_system_get_info(HSA_SYSTEM_INFO_TIMESTAMP_FREQUENCY, &sysclock_hz);
+    hsa_status_t status = hsa_api_->hsa_system_get_info(HSA_SYSTEM_INFO_TIMESTAMP_FREQUENCY, &sysclock_hz);
     CHECK_STATUS("hsa_system_get_info(HSA_SYSTEM_INFO_TIMESTAMP_FREQUENCY)", status);
     sysclock_factor_ = (freq_t)1000000000 / (freq_t)sysclock_hz;
   }
@@ -186,7 +188,7 @@ class HsaTimer {
   // Return timestamp in 'ns'
   timestamp_t timestamp_ns() const {
     timestamp_t sysclock;
-    hsa_status_t status = hsa_system_get_info(HSA_SYSTEM_INFO_TIMESTAMP, &sysclock);
+    hsa_status_t status = hsa_api_->hsa_system_get_info(HSA_SYSTEM_INFO_TIMESTAMP, &sysclock);
     CHECK_STATUS("hsa_system_get_info(HSA_SYSTEM_INFO_TIMESTAMP)", status);
     return sysclock_to_ns(sysclock);
   }
@@ -194,6 +196,8 @@ class HsaTimer {
  private:
   // Timestamp frequency factor
   freq_t sysclock_factor_;
+  // HSA API table
+  const hsa_pfn_t* const hsa_api_;
 };
 
 class HsaRsrcFactory {