diff --git a/Include/Aurora/Process/Paths.hpp b/Include/Aurora/Process/Paths.hpp
index d1669bc2..b71af0c8 100644
--- a/Include/Aurora/Process/Paths.hpp
+++ b/Include/Aurora/Process/Paths.hpp
@@ -20,17 +20,17 @@ namespace Aurora::Process
      * @brief Fetches the applications binary or package directory
      * @return 
      */
-    AUKN_SYM const AuString *GetProcessDirectory();
+    AUKN_SYM AuOptional<const AuString &> GetProcessDirectory();
     
     /**
      * @brief Fetches the full-path of the applications binary, if known
      * @return 
      */
-    AUKN_SYM const AuString *GetProcessFullPath();
+    AUKN_SYM AuOptional<const AuString &> GetProcessFullPath();
     
     /**
      * @brief Fetches the applications primary module name
      * @return 
      */
-    AUKN_SYM const AuString *GetProcessName();
+    AUKN_SYM AuOptional<const AuString &> GetProcessName();
 }
\ No newline at end of file
diff --git a/Source/Process/AuPaths.cpp b/Source/Process/AuPaths.cpp
index c45175a5..ab75a5d8 100644
--- a/Source/Process/AuPaths.cpp
+++ b/Source/Process/AuPaths.cpp
@@ -246,7 +246,7 @@ namespace Aurora::Process
         return true;
     }
 
-    AUKN_SYM const AuString *GetProcessName()
+    AUKN_SYM AuOptional<const AuString &> GetProcessName()
     {
         const AuString *pModule, *pPartial, *pFull;
 
@@ -256,7 +256,7 @@ namespace Aurora::Process
                 pModule &&
                 pModule->size())
             {
-                return pModule;
+                return *pModule;
             }
         }
         catch (...)
@@ -264,10 +264,10 @@ namespace Aurora::Process
             SysPushErrorCatch();
         }
 
-        return nullptr;
+        return {};
     }
 
-    AUKN_SYM const AuString *GetProcessDirectory()
+    AUKN_SYM AuOptional<const AuString &> GetProcessDirectory()
     {
         const AuString *pModule, *pPartial, *pFull;
 
@@ -277,7 +277,7 @@ namespace Aurora::Process
                 pPartial &&
                 pPartial->size())
             {
-                return pPartial;
+                return *pPartial;
             }
 
             {
@@ -291,7 +291,7 @@ namespace Aurora::Process
 
                 if (cwd.size())
                 {
-                    return &cwd;
+                    return cwd;
                 }
             }
         }
@@ -300,10 +300,10 @@ namespace Aurora::Process
             SysPushErrorCatch();
         }
 
-        return nullptr;
+        return {};
     }
 
-    AUKN_SYM const AuString *GetProcessFullPath()
+    AUKN_SYM AuOptional<const AuString &> GetProcessFullPath()
     {
         const AuString *pModule, *pPartial, *pFull;
 
@@ -313,7 +313,7 @@ namespace Aurora::Process
                 pFull &&
                 pFull->size())
             {
-                return pFull;
+                return *pFull;
             }
         }
         catch (...)
@@ -321,6 +321,6 @@ namespace Aurora::Process
             SysPushErrorCatch();
         }
 
-        return nullptr;
+        return {};
     }
 }
\ No newline at end of file