diff --git a/Sources/7-Zip/7zContainer.swift b/Sources/7-Zip/7zContainer.swift
index f0df1170..430e15cb 100644
--- a/Sources/7-Zip/7zContainer.swift
+++ b/Sources/7-Zip/7zContainer.swift
@@ -6,7 +6,7 @@
 import Foundation
 
 /// Provides open functions for 7-Zip containers.
-public class SevenZipContainer {
+public class SevenZipContainer: Container {
 
     static let signatureHeaderSize = 32
 
diff --git a/Sources/ZIP/ZipEntryInfo.swift b/Sources/ZIP/ZipEntryInfo.swift
index 1cf13ac4..e4751248 100644
--- a/Sources/ZIP/ZipEntryInfo.swift
+++ b/Sources/ZIP/ZipEntryInfo.swift
@@ -7,9 +7,6 @@ import Foundation
 
 public struct ZipEntryInfo: ContainerEntryInfo {
 
-    let cdEntry: ZipCentralDirectoryEntry
-    let localHeader: ZipLocalHeader
-
     // MARK: ContainerEntryInfo
     
     /// Name of the file or directory.
@@ -43,6 +40,9 @@ public struct ZipEntryInfo: ContainerEntryInfo {
     public let fileSystemType: FileSystemType?
     
     public let compressionMethod: CompressionMethod
+    
+    let cdEntry: ZipCentralDirectoryEntry
+    let localHeader: ZipLocalHeader
 
     // We don't use `DataWithPointer` as argument, because it doesn't work well in asynchronous environment.
     init(_ data: Data, _ offset: Int, _ currentDiskNumber: UInt32) throws {