diff --git a/openVulkanoCpp/Host/Windows/SystemInfo.cpp b/openVulkanoCpp/Host/Windows/SystemInfo.cpp
index 2f4eecc..72e17ee 100644
--- a/openVulkanoCpp/Host/Windows/SystemInfo.cpp
+++ b/openVulkanoCpp/Host/Windows/SystemInfo.cpp
@@ -359,7 +359,7 @@ namespace OpenVulkano
 		return ReadAppMemInfo(APP_MEM_TYPE::VM_MAX);
 	}
 
-	std::string SystemInfo::GetUserName()
+	const std::string& SystemInfo::GetUserName()
 	{
 		static std::string userName;
 		if (userName.empty())
@@ -372,7 +372,7 @@ namespace OpenVulkano
 		return userName;
 	}
 	
-	std::string SystemInfo::GetHostName()
+	const std::string& SystemInfo::GetHostName()
 	{
 		static std::string hostName;
 		if (hostName.empty())
@@ -384,7 +384,7 @@ namespace OpenVulkano
 		return hostName;
 	}
 	
-	std::string SystemInfo::GetDeviceName()
+	const std::string& SystemInfo::GetDeviceName()
 	{
 		static std::string devName;
 		if (devName.empty())
@@ -397,7 +397,7 @@ namespace OpenVulkano
 		return devName;
 	}
 	
-	std::string SystemInfo::GetDeviceVendorName()
+	const std::string& SystemInfo::GetDeviceVendorName()
 	{
 		static std::string vendorName;
 		if (vendorName.empty())
@@ -408,7 +408,7 @@ namespace OpenVulkano
 		return vendorName;
 	}
 	
-	std::string SystemInfo::GetDeviceModelName()
+	const std::string& SystemInfo::GetDeviceModelName()
 	{ 
 		static std::string deviceModelName;
 		if (deviceModelName.empty())
@@ -419,7 +419,7 @@ namespace OpenVulkano
 		return deviceModelName;
 	}
 	
-	std::string SystemInfo::GetOsName()
+	const std::string& SystemInfo::GetOsName()
 	{
 		return "Windows";
 	}
@@ -439,7 +439,7 @@ namespace OpenVulkano
 		return osVersion;
 	}
 	
-	std::string SystemInfo::GetOsNameHumanReadable()
+	const std::string& SystemInfo::GetOsNameHumanReadable()
 	{
 		static const std::string osName = GetHumanReadableOSName();
 		return osName;