diff --git a/modules/renderer/private/vk/context/instance.cpp b/modules/renderer/private/vk/context/instance.cpp
index 9b56234..a544edd 100644
--- a/modules/renderer/private/vk/context/instance.cpp
+++ b/modules/renderer/private/vk/context/instance.cpp
@@ -14,83 +14,83 @@ namespace lt::renderer::vk {
 
 // NOLINTBEGIN(cppcoreguidelines-avoid-non-const-global-variables)
 // global functions
-PFN_vkGetInstanceProcAddr vk_get_instance_proc_address;
-PFN_vkCreateInstance vk_create_instance;
-PFN_vkEnumerateInstanceExtensionProperties vk_enumerate_instance_extension_properties;
-PFN_vkEnumerateInstanceLayerProperties vk_enumerate_instance_layer_properties;
+PFN_vkGetInstanceProcAddr vk_get_instance_proc_address {};
+PFN_vkCreateInstance vk_create_instance {};
+PFN_vkEnumerateInstanceExtensionProperties vk_enumerate_instance_extension_properties {};
+PFN_vkEnumerateInstanceLayerProperties vk_enumerate_instance_layer_properties {};
 
 // instance functions
-PFN_vkDestroyInstance vk_destroy_instance;
-PFN_vkEnumeratePhysicalDevices vk_enumerate_physical_devices;
-PFN_vkGetPhysicalDeviceProperties vk_get_physical_device_properties;
-PFN_vkGetPhysicalDeviceQueueFamilyProperties vk_get_physical_device_queue_family_properties;
-PFN_vkCreateDevice vk_create_device;
-PFN_vkGetDeviceProcAddr vk_get_device_proc_address;
-PFN_vkDestroyDevice vk_destroy_device;
-PFN_vkGetPhysicalDeviceFeatures vk_get_physical_device_features;
-PFN_vkEnumerateDeviceExtensionProperties vk_enumerate_device_extension_properties;
+PFN_vkDestroyInstance vk_destroy_instance {};
+PFN_vkEnumeratePhysicalDevices vk_enumerate_physical_devices {};
+PFN_vkGetPhysicalDeviceProperties vk_get_physical_device_properties {};
+PFN_vkGetPhysicalDeviceQueueFamilyProperties vk_get_physical_device_queue_family_properties {};
+PFN_vkCreateDevice vk_create_device {};
+PFN_vkGetDeviceProcAddr vk_get_device_proc_address {};
+PFN_vkDestroyDevice vk_destroy_device {};
+PFN_vkGetPhysicalDeviceFeatures vk_get_physical_device_features {};
+PFN_vkEnumerateDeviceExtensionProperties vk_enumerate_device_extension_properties {};
 
 // extension instance functions
-PFN_vkCmdBeginDebugUtilsLabelEXT vk_cmd_begin_debug_label;
-PFN_vkCmdEndDebugUtilsLabelEXT vk_cmd_end_debug_label;
-PFN_vkCmdInsertDebugUtilsLabelEXT vk_cmd_insert_debug_label;
-PFN_vkCreateDebugUtilsMessengerEXT vk_create_debug_messenger;
-PFN_vkDestroyDebugUtilsMessengerEXT vk_destroy_debug_messenger;
-PFN_vkQueueBeginDebugUtilsLabelEXT vk_queue_begin_debug_label;
-PFN_vkQueueEndDebugUtilsLabelEXT vk_queue_end_debug_label;
-PFN_vkQueueInsertDebugUtilsLabelEXT vk_queue_insert_debug_label;
-PFN_vkSetDebugUtilsObjectNameEXT vk_set_debug_object_name;
-PFN_vkSetDebugUtilsObjectTagEXT vk_set_debug_object_tag;
-PFN_vkSubmitDebugUtilsMessageEXT vk_submit_debug_message;
+PFN_vkCmdBeginDebugUtilsLabelEXT vk_cmd_begin_debug_label {};
+PFN_vkCmdEndDebugUtilsLabelEXT vk_cmd_end_debug_label {};
+PFN_vkCmdInsertDebugUtilsLabelEXT vk_cmd_insert_debug_label {};
+PFN_vkCreateDebugUtilsMessengerEXT vk_create_debug_messenger {};
+PFN_vkDestroyDebugUtilsMessengerEXT vk_destroy_debug_messenger {};
+PFN_vkQueueBeginDebugUtilsLabelEXT vk_queue_begin_debug_label {};
+PFN_vkQueueEndDebugUtilsLabelEXT vk_queue_end_debug_label {};
+PFN_vkQueueInsertDebugUtilsLabelEXT vk_queue_insert_debug_label {};
+PFN_vkSetDebugUtilsObjectNameEXT vk_set_debug_object_name {};
+PFN_vkSetDebugUtilsObjectTagEXT vk_set_debug_object_tag {};
+PFN_vkSubmitDebugUtilsMessageEXT vk_submit_debug_message {};
 
 // device functions
-PFN_vkGetDeviceQueue vk_get_device_queue;
-PFN_vkCreateCommandPool vk_create_command_pool;
-PFN_vkDestroyCommandPool vk_destroy_command_pool;
-PFN_vkAllocateCommandBuffers vk_allocate_command_buffers;
-PFN_vkFreeCommandBuffers vk_free_command_buffers;
-PFN_vkBeginCommandBuffer vk_begin_command_buffer;
-PFN_vkEndCommandBuffer vk_end_command_buffer;
-PFN_vkCmdPipelineBarrier vk_cmd_pipeline_barrier;
-PFN_vkQueueSubmit vk_queue_submit;
-PFN_vkQueueWaitIdle vk_queue_wait_idle;
-PFN_vkDeviceWaitIdle vk_device_wait_idle;
-PFN_vkCreateFence vk_create_fence;
-PFN_vkDestroyFence vk_destroy_fence;
-PFN_vkWaitForFences vk_wait_for_fences;
-PFN_vkResetFences vk_reset_fences;
-PFN_vkCreateSemaphore vk_create_semaphore;
-PFN_vkDestroySemaphore vk_destroy_semaphore;
-PFN_vkCreateSwapchainKHR vk_create_swapchain_khr;
-PFN_vkDestroySwapchainKHR vk_destroy_swapchain_khr;
-PFN_vkGetSwapchainImagesKHR vk_get_swapchain_images_khr;
-PFN_vkAcquireNextImageKHR vk_acquire_next_image_khr;
-PFN_vkQueuePresentKHR vk_queue_present_khr;
-PFN_vkCreateImageView vk_create_image_view;
-PFN_vkDestroyImageView vk_destroy_image_view;
-PFN_vkCreateRenderPass vk_create_render_pass;
-PFN_vkDestroyRenderPass vk_destroy_render_pass;
-PFN_vkCreateFramebuffer vk_create_frame_buffer;
-PFN_vkDestroyFramebuffer vk_destroy_frame_buffer;
-PFN_vkCreateShaderModule vk_create_shader_module;
-PFN_vkDestroyShaderModule vk_destroy_shader_module;
-PFN_vkCreatePipelineLayout vk_create_pipeline_layout;
-PFN_vkDestroyPipelineLayout vk_destroy_pipeline_layout;
-PFN_vkCreateGraphicsPipelines vk_create_graphics_pipelines;
-PFN_vkDestroyPipeline vk_destroy_pipeline;
-PFN_vkCmdBeginRenderPass vk_cmd_begin_render_pass;
-PFN_vkCmdEndRenderPass vk_cmd_end_render_pass;
-PFN_vkCmdBindPipeline vk_cmd_bind_pipeline;
-PFN_vkCmdDraw vk_cmd_draw;
-PFN_vkCmdSetViewport vk_cmd_set_viewport;
-PFN_vkCmdSetScissor vk_cmd_set_scissors;
+PFN_vkGetDeviceQueue vk_get_device_queue {};
+PFN_vkCreateCommandPool vk_create_command_pool {};
+PFN_vkDestroyCommandPool vk_destroy_command_pool {};
+PFN_vkAllocateCommandBuffers vk_allocate_command_buffers {};
+PFN_vkFreeCommandBuffers vk_free_command_buffers {};
+PFN_vkBeginCommandBuffer vk_begin_command_buffer {};
+PFN_vkEndCommandBuffer vk_end_command_buffer {};
+PFN_vkCmdPipelineBarrier vk_cmd_pipeline_barrier {};
+PFN_vkQueueSubmit vk_queue_submit {};
+PFN_vkQueueWaitIdle vk_queue_wait_idle {};
+PFN_vkDeviceWaitIdle vk_device_wait_idle {};
+PFN_vkCreateFence vk_create_fence {};
+PFN_vkDestroyFence vk_destroy_fence {};
+PFN_vkWaitForFences vk_wait_for_fences {};
+PFN_vkResetFences vk_reset_fences {};
+PFN_vkCreateSemaphore vk_create_semaphore {};
+PFN_vkDestroySemaphore vk_destroy_semaphore {};
+PFN_vkCreateSwapchainKHR vk_create_swapchain_khr {};
+PFN_vkDestroySwapchainKHR vk_destroy_swapchain_khr {};
+PFN_vkGetSwapchainImagesKHR vk_get_swapchain_images_khr {};
+PFN_vkAcquireNextImageKHR vk_acquire_next_image_khr {};
+PFN_vkQueuePresentKHR vk_queue_present_khr {};
+PFN_vkCreateImageView vk_create_image_view {};
+PFN_vkDestroyImageView vk_destroy_image_view {};
+PFN_vkCreateRenderPass vk_create_render_pass {};
+PFN_vkDestroyRenderPass vk_destroy_render_pass {};
+PFN_vkCreateFramebuffer vk_create_frame_buffer {};
+PFN_vkDestroyFramebuffer vk_destroy_frame_buffer {};
+PFN_vkCreateShaderModule vk_create_shader_module {};
+PFN_vkDestroyShaderModule vk_destroy_shader_module {};
+PFN_vkCreatePipelineLayout vk_create_pipeline_layout {};
+PFN_vkDestroyPipelineLayout vk_destroy_pipeline_layout {};
+PFN_vkCreateGraphicsPipelines vk_create_graphics_pipelines {};
+PFN_vkDestroyPipeline vk_destroy_pipeline {};
+PFN_vkCmdBeginRenderPass vk_cmd_begin_render_pass {};
+PFN_vkCmdEndRenderPass vk_cmd_end_render_pass {};
+PFN_vkCmdBindPipeline vk_cmd_bind_pipeline {};
+PFN_vkCmdDraw vk_cmd_draw {};
+PFN_vkCmdSetViewport vk_cmd_set_viewport {};
+PFN_vkCmdSetScissor vk_cmd_set_scissors {};
 
-PFN_vkGetPhysicalDeviceSurfaceSupportKHR vk_get_physical_device_surface_support;
-PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR vk_get_physical_device_surface_capabilities;
-PFN_vkGetPhysicalDeviceSurfaceFormatsKHR vk_get_physical_device_surface_formats;
+PFN_vkGetPhysicalDeviceSurfaceSupportKHR vk_get_physical_device_surface_support {};
+PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR vk_get_physical_device_surface_capabilities {};
+PFN_vkGetPhysicalDeviceSurfaceFormatsKHR vk_get_physical_device_surface_formats {};
 
-PFN_vkCreateXlibSurfaceKHR vk_create_xlib_surface_khr;
-PFN_vkDestroySurfaceKHR vk_destroy_surface_khr;
+PFN_vkCreateXlibSurfaceKHR vk_create_xlib_surface_khr {};
+PFN_vkDestroySurfaceKHR vk_destroy_surface_khr {};
 // NOLINTEND(cppcoreguidelines-avoid-non-const-global-variables)
 
 auto parse_message_type(VkDebugUtilsMessageTypeFlagsEXT message_types) -> const char *;
diff --git a/modules/renderer/private/vk/context/instance.hpp b/modules/renderer/private/vk/context/instance.hpp
index 8b587a1..467a3bc 100644
--- a/modules/renderer/private/vk/context/instance.hpp
+++ b/modules/renderer/private/vk/context/instance.hpp
@@ -47,6 +47,13 @@ extern PFN_vkSetDebugUtilsObjectNameEXT vk_set_debug_object_name;
 extern PFN_vkSetDebugUtilsObjectTagEXT vk_set_debug_object_tag;
 extern PFN_vkSubmitDebugUtilsMessageEXT vk_submit_debug_message;
 
+// surface instance functions
+extern PFN_vkGetPhysicalDeviceSurfaceSupportKHR vk_get_physical_device_surface_support;
+extern PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR vk_get_physical_device_surface_capabilities;
+extern PFN_vkGetPhysicalDeviceSurfaceFormatsKHR vk_get_physical_device_surface_formats;
+extern PFN_vkCreateXlibSurfaceKHR vk_create_xlib_surface_khr;
+extern PFN_vkDestroySurfaceKHR vk_destroy_surface_khr;
+
 // device functions
 extern PFN_vkGetDeviceQueue vk_get_device_queue;
 extern PFN_vkCreateCommandPool vk_create_command_pool;
@@ -89,13 +96,6 @@ extern PFN_vkCmdDraw vk_cmd_draw;
 extern PFN_vkCmdSetViewport vk_cmd_set_viewport;
 extern PFN_vkCmdSetScissor vk_cmd_set_scissors;
 
-// Surface
-extern PFN_vkGetPhysicalDeviceSurfaceSupportKHR vk_get_physical_device_surface_support;
-extern PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR vk_get_physical_device_surface_capabilities;
-extern PFN_vkGetPhysicalDeviceSurfaceFormatsKHR vk_get_physical_device_surface_formats;
-
-extern PFN_vkCreateXlibSurfaceKHR vk_create_xlib_surface_khr;
-extern PFN_vkDestroySurfaceKHR vk_destroy_surface_khr;
 // NOLINTEND(cppcoreguidelines-avoid-non-const-global-variables)
 
 /**