@@ -19,11 +19,11 @@
 #include <errno.h>
 
 #import "OFZIPArchive.h"
 #import "OFZIPArchiveEntry.h"
 #import "OFZIPArchiveEntry+Private.h"
-#import "OFDataArray.h"
+#import "OFData.h"
 #import "OFArray.h"
 #import "OFDictionary.h"
 #import "OFSeekableStream.h"
 #ifdef OF_HAVE_FILES
 # import "OFFile.h"
@@ -61,11 +61,11 @@
 	uint16_t _minVersionNeeded, _generalPurposeBitFlag, _compressionMethod;
 	uint16_t _lastModifiedFileTime, _lastModifiedFileDate;
 	uint32_t _CRC32;
 	uint64_t _compressedSize, _uncompressedSize;
 	OFString *_fileName;
-	OFDataArray *_extraField;
+	OFData *_extraField;
 }
 
 - initWithStream: (OFStream *)stream;
 - (bool)matchesEntry: (OFZIPArchiveEntry *)entry;
 @end
@@ -83,11 +83,11 @@
 -  initWithStream: (OFStream *)path
   localFileHeader: (OFZIPArchive_LocalFileHeader *)localFileHeader;
 @end
 
 uint32_t
-of_zip_archive_read_field32(uint8_t **data, uint16_t *size)
+of_zip_archive_read_field32(const uint8_t **data, uint16_t *size)
 {
 	uint32_t field = 0;
 
 	if (*size < 4)
 		@throw [OFInvalidFormatException exception];
@@ -100,11 +100,11 @@
 
 	return field;
 }
 
 uint64_t
-of_zip_archive_read_field64(uint8_t **data, uint16_t *size)
+of_zip_archive_read_field64(const uint8_t **data, uint16_t *size)
 {
 	uint64_t field = 0;
 
 	if (*size < 8)
 		@throw [OFInvalidFormatException exception];
@@ -374,11 +374,11 @@
 	self = [super init];
 
 	@try {
 		uint16_t fileNameLength, extraFieldLength;
 		of_string_encoding_t encoding;
-		uint8_t *ZIP64;
+		const uint8_t *ZIP64;
 		uint16_t ZIP64Size;
 
 		if ([stream readLittleEndianInt32] != 0x04034B50)
 			@throw [OFInvalidFormatException exception];
 
@@ -396,12 +396,12 @@
 		    ? OF_STRING_ENCODING_UTF_8
 		    : OF_STRING_ENCODING_CODEPAGE_437);
 
 		_fileName = [[stream readStringWithLength: fileNameLength
 						 encoding: encoding] copy];
-		_extraField = [[stream
-		    readDataArrayWithCount: extraFieldLength] retain];
+		_extraField =
+		    [[stream readDataWithCount: extraFieldLength] copy];
 
 		of_zip_archive_entry_extra_field_find(_extraField,
 		    OF_ZIP_ARCHIVE_ENTRY_EXTRA_FIELD_ZIP64, &ZIP64, &ZIP64Size);
 
 		if (ZIP64 != NULL) {