diff --git a/openVulkanoCpp/Host/SystemInfo.hpp b/openVulkanoCpp/Host/SystemInfo.hpp
index b42ed10..7ab324c 100644
--- a/openVulkanoCpp/Host/SystemInfo.hpp
+++ b/openVulkanoCpp/Host/SystemInfo.hpp
@@ -36,16 +36,16 @@ namespace OpenVulkano
 		static size_t GetAppRamAvailable();
 		static size_t GetAppRamUsed();
 
-		static std::string GetUserName();
-		static std::string GetHostName();
+		static const std::string& GetUserName();
+		static const std::string& GetHostName();
 
 		// Device name as given by the user
-		static std::string GetDeviceName();
-		static std::string GetDeviceVendorName();
-		static std::string GetDeviceModelName();
-		static std::string GetOsName();
+		static const std::string& GetDeviceName();
+		static const std::string& GetDeviceVendorName();
+		static const std::string& GetDeviceModelName();
+		static const std::string& GetOsName();
 		static OsVersion   GetOsVersion();
-		static std::string GetOsNameHumanReadable();
+		static const std::string& GetOsNameHumanReadable();
 		static DeviceType  GetDeviceType();
 
 		static size_t  GetCpuCoreCount();