@@ -19,10 +19,11 @@
 #import "OFString.h"
 
 OF_ASSUME_NONNULL_BEGIN
 
 @class OFStream;
+@class OFURI;
 
 /**
  * @class OFLHAArchive OFLHAArchive.h ObjFW/OFLHAArchive.h
  *
  * @brief A class for accessing and manipulating LHA files.
@@ -31,28 +32,22 @@
 @interface OFLHAArchive: OFObject
 {
 	OFStream *_stream;
 	uint_least8_t _mode;
 	OFStringEncoding _encoding;
+	OFLHAArchiveEntry *_Nullable _currentEntry;
+#ifdef OF_LHA_ARCHIVE_M
+@public
+#endif
 	OFStream *_Nullable _lastReturnedStream;
 }
 
 /**
  * @brief The encoding to use for the archive. Defaults to ISO 8859-1.
  */
 @property (nonatomic) OFStringEncoding encoding;
 
-/**
- * @brief A stream for reading the current entry.
- *
- * @note This is only available in read mode.
- *
- * @note The returned stream conforms to @ref OFReadyForReadingObserving if the
- *	 underlying stream does so, too.
- */
-@property (readonly, nonatomic) OFStream *streamForReadingCurrentEntry;
-
 /**
  * @brief Creates a new OFLHAArchive object with the specified stream.
  *
  * @param stream A stream from which the LHA archive will be read.
  *		 For read and append mode, this needs to be an OFSeekableStream.
@@ -61,22 +56,31 @@
  *	       archive.
  * @return A new, autoreleased OFLHAArchive
  */
 + (instancetype)archiveWithStream: (OFStream *)stream mode: (OFString *)mode;
 
-#ifdef OF_HAVE_FILES
 /**
  * @brief Creates a new OFLHAArchive object with the specified file.
  *
- * @param path The path to the LHA file
+ * @param URI The URI to the LHA file
  * @param mode The mode for the LHA file. Valid modes are "r" for reading,
  *	       "w" for creating a new file and "a" for appending to an existing
  *	       archive.
  * @return A new, autoreleased OFLHAArchive
  */
-+ (instancetype)archiveWithPath: (OFString *)path mode: (OFString *)mode;
-#endif
++ (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode;
+
+/**
+ * @brief Creates a URI for accessing a the specified file within the specified
+ *	  LHA archive.
+ *
+ * @param path The path of the file within the archive
+ * @param URI The URI of the archive
+ * @return A URI for accessing the specified file within the specified LHA
+ *	   archive
+ */
++ (OFURI *)URIForFilePath: (OFString *)path inArchiveWithURI: (OFURI *)URI;
 
 - (instancetype)init OF_UNAVAILABLE;
 
 /**
  * @brief Initializes an already allocated OFLHAArchive object with the
@@ -90,23 +94,21 @@
  * @return An initialized OFLHAArchive
  */
 - (instancetype)initWithStream: (OFStream *)stream
 			  mode: (OFString *)mode OF_DESIGNATED_INITIALIZER;
 
-#ifdef OF_HAVE_FILES
 /**
  * @brief Initializes an already allocated OFLHAArchive object with the
  *	  specified file.
  *
- * @param path The path to the LHA file
+ * @param URI The URI to the LHA file
  * @param mode The mode for the LHA file. Valid modes are "r" for reading,
  *	       "w" for creating a new file and "a" for appending to an existing
  *	       archive.
  * @return An initialized OFLHAArchive
  */
-- (instancetype)initWithPath: (OFString *)path mode: (OFString *)mode;
-#endif
+- (instancetype)initWithURI: (OFURI *)URI mode: (OFString *)mode;
 
 /**
  * @brief Returns the next entry from the LHA archive or `nil` if all entries
  *	  have been read.
  *
@@ -118,13 +120,29 @@
  *	    invalidated stream will throw an @ref OFReadFailedException or
  *	    @ref OFWriteFailedException!
  *
  * @return The next entry from the LHA archive or `nil` if all entries have
  *	   been read
+ * @throw OFInvalidFormatException The archive's format is invalid
+ * @throw OFUnsupportedVersionException The archive's format is of an
+ *					unsupported version
+ * @throw OFTruncatedDataException The archive was truncated
  */
 - (nullable OFLHAArchiveEntry *)nextEntry;
 
+/**
+ * @brief Returns a stream for reading the current entry.
+ *
+ * @note This is only available in read mode.
+ *
+ * @note The returned stream conforms to @ref OFReadyForReadingObserving if the
+ *	 underlying stream does so, too.
+ *
+ * @return A stream for reading the current entry
+ */
+- (OFStream *)streamForReadingCurrentEntry;
+
 /**
  * @brief Returns a stream for writing the specified entry.
  *
  * @note This is only available in write and append mode.
  *
@@ -145,10 +163,12 @@
  */
 - (OFStream *)streamForWritingEntry: (OFLHAArchiveEntry *)entry;
 
 /**
  * @brief Closes the OFLHAArchive.
+ *
+ * @throw OFNotOpenException The archive is not open
  */
 - (void)close;
 @end
 
 OF_ASSUME_NONNULL_END