diff --git a/Include/Aurora/IO/IOHandle.hpp b/Include/Aurora/IO/IOHandle.hpp
index e5a72834..3a01812d 100644
--- a/Include/Aurora/IO/IOHandle.hpp
+++ b/Include/Aurora/IO/IOHandle.hpp
@@ -103,25 +103,25 @@ namespace Aurora::IO
 
         virtual bool InitFromMove(AuUInt64 uOSHandle) = 0;
 
-        virtual bool InitFromPair(AuOptional<AuUInt64> uOSReadHandle,
-                                  AuOptional<AuUInt64> uOSWriteHandle) = 0;
+        virtual bool InitFromPair(AuOptionalEx<AuUInt64> optOSReadHandle,
+                                  AuOptionalEx<AuUInt64> optOSWriteHandle) = 0;
 
-        virtual bool InitFromPairMove(AuOptional<AuUInt64> uOSReadHandle,
-                                      AuOptional<AuUInt64> uOSWriteHandle) = 0;
+        virtual bool InitFromPairMove(AuOptionalEx<AuUInt64> optOSReadHandle,
+                                      AuOptionalEx<AuUInt64> optOSWriteHandle) = 0;
 
         virtual bool InitFromStreamEnum(EStandardStream eStream) = 0;
 
         virtual AuUInt64 GetOSHandle() const = 0;
 
-        virtual AuOptional<AuUInt64> GetOSHandleSafe() const = 0;
+        virtual AuOptionalEx<AuUInt64> GetOSHandleSafe() const = 0;
 
         virtual AuUInt64 GetOSReadHandle() const = 0;
 
-        virtual AuOptional<AuUInt64> GetOSReadHandleSafe() const = 0;
+        virtual AuOptionalEx<AuUInt64> GetOSReadHandleSafe() const = 0;
 
         virtual AuUInt64 GetOSWriteHandle() const = 0;
 
-        virtual AuOptional<AuUInt64> GetOSWriteHandleSafe() const = 0;
+        virtual AuOptionalEx<AuUInt64> GetOSWriteHandleSafe() const = 0;
 
         virtual bool IsValid() const = 0;
 
diff --git a/Source/IO/AuIOHandle.cpp b/Source/IO/AuIOHandle.cpp
index cfb701ed..d3c9016e 100644
--- a/Source/IO/AuIOHandle.cpp
+++ b/Source/IO/AuIOHandle.cpp
@@ -82,8 +82,8 @@ namespace Aurora::IO
         return true;
     }
     
-    bool AFileHandle::InitFromPair(AuOptional<AuUInt64> optOSReadHandle,
-                                   AuOptional<AuUInt64> optOSWriteHandle)
+    bool AFileHandle::InitFromPair(AuOptionalEx<AuUInt64> optOSReadHandle,
+                                   AuOptionalEx<AuUInt64> optOSWriteHandle)
     {
         if (this->IsValid())
         {
@@ -119,8 +119,8 @@ namespace Aurora::IO
         return true;
     }
 
-    bool AFileHandle::InitFromPairMove(AuOptional<AuUInt64> uOSReadHandle,
-                                       AuOptional<AuUInt64> uOSWriteHandle)
+    bool AFileHandle::InitFromPairMove(AuOptionalEx<AuUInt64> uOSReadHandle,
+        AuOptionalEx<AuUInt64> uOSWriteHandle)
     {
         if (this->IsValid())
         {
@@ -219,7 +219,7 @@ namespace Aurora::IO
         return bIsPipe;
     }
 
-    AuOptional<AuUInt64> AFileHandle::GetOSHandleSafe() const
+    AuOptionalEx<AuUInt64> AFileHandle::GetOSHandleSafe() const
     {
         if (auto write = this->uOSWriteHandle)
         {
@@ -236,7 +236,7 @@ namespace Aurora::IO
 
     AuUInt64 AFileHandle::GetOSHandle() const
     {
-        return this->uOSReadHandle.value_or(this->uOSWriteHandle.value());
+        return this->uOSReadHandle.ValueOr(this->uOSWriteHandle.value());
     }
 
     AuUInt64 AFileHandle::GetOSReadHandle() const
@@ -244,7 +244,7 @@ namespace Aurora::IO
         return this->uOSReadHandle.value();
     }
 
-    AuOptional<AuUInt64> AFileHandle::GetOSReadHandleSafe() const
+    AuOptionalEx<AuUInt64> AFileHandle::GetOSReadHandleSafe() const
     {
         return this->uOSReadHandle;
     }
@@ -254,7 +254,7 @@ namespace Aurora::IO
         return this->uOSWriteHandle.value();
     }
 
-    AuOptional<AuUInt64> AFileHandle::GetOSWriteHandleSafe() const
+    AuOptionalEx<AuUInt64> AFileHandle::GetOSWriteHandleSafe() const
     {
         return this->uOSWriteHandle;
     }
diff --git a/Source/IO/AuIOHandle.hpp b/Source/IO/AuIOHandle.hpp
index 412b431e..6f5ca48a 100644
--- a/Source/IO/AuIOHandle.hpp
+++ b/Source/IO/AuIOHandle.hpp
@@ -24,11 +24,11 @@ namespace Aurora::IO
 
         bool InitFromMove(AuUInt64 uOSHandle) override;
 
-        bool InitFromPair(AuOptional<AuUInt64> uOSReadHandle,
-                          AuOptional<AuUInt64> uOSWriteHandle) override;
+        bool InitFromPair(AuOptionalEx<AuUInt64> uOSReadHandle,
+                          AuOptionalEx<AuUInt64> uOSWriteHandle) override;
 
-        bool InitFromPairMove(AuOptional<AuUInt64> uOSReadHandle,
-                              AuOptional<AuUInt64> uOSWriteHandle) override;
+        bool InitFromPairMove(AuOptionalEx<AuUInt64> uOSReadHandle,
+                              AuOptionalEx<AuUInt64> uOSWriteHandle) override;
 
         bool InitFromStreamEnum(EStandardStream eStream) override;
 
@@ -36,15 +36,15 @@ namespace Aurora::IO
 
         AuUInt64 GetOSHandle() const override;
 
-        AuOptional<AuUInt64> GetOSHandleSafe() const override;
+        AuOptionalEx<AuUInt64> GetOSHandleSafe() const override;
 
         AuUInt64 GetOSReadHandle() const override;
 
-        AuOptional<AuUInt64> GetOSReadHandleSafe() const override;
+        AuOptionalEx<AuUInt64> GetOSReadHandleSafe() const override;
 
         AuUInt64 GetOSWriteHandle() const override;
 
-        AuOptional<AuUInt64> GetOSWriteHandleSafe() const override;
+        AuOptionalEx<AuUInt64> GetOSWriteHandleSafe() const override;
 
         bool IsValid() const override;
 
@@ -68,8 +68,8 @@ namespace Aurora::IO
         bool SectionUnlock(AuUInt64 uOffset,
                            AuUInt64 uLength) override;
         
-        AuOptional<AuUInt64> uOSWriteHandle;
-        AuOptional<AuUInt64> uOSReadHandle;
+        AuOptionalEx<AuUInt64> uOSWriteHandle;
+        AuOptionalEx<AuUInt64> uOSReadHandle;
         AuSPtr<IIOHandle> pThat;
         bool bIsAsync {};
         AuString path;