diff --git a/pom.xml b/pom.xml
index ada9def..c3112cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,9 +36,9 @@
     </scm>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-        <maven.compiler.release>8</maven.compiler.release>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.release>11</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
diff --git a/src/main/java/com/riscure/trs/LargePreMappedFile.java b/src/main/java/com/riscure/trs/LargePreMappedFile.java
new file mode 100644
index 0000000..405f9e3
--- /dev/null
+++ b/src/main/java/com/riscure/trs/LargePreMappedFile.java
@@ -0,0 +1,102 @@
+package com.riscure.trs;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.FileChannel;
+import java.util.ArrayList;
+import java.util.List;
+
+public class LargePreMappedFile implements AutoCloseable {
+    private final FileChannel channel;
+
+    private final List<MappedBuffer> buffers = new ArrayList<>();
+    private final long readOffset;
+    private final long traceSize;
+    private final long fileSize;
+
+    public LargePreMappedFile(FileChannel channel, long metaDataSize, long traceSize) throws IOException {
+        this.channel = channel;
+        this.readOffset = metaDataSize;
+        this.traceSize = traceSize;
+        this.fileSize = channel.size() - readOffset;
+
+        mapBuffers();
+    }
+
+    public ByteBuffer getBuffer(int index) {
+        if (traceSize == 0) {
+            return ByteBuffer.wrap(new byte[0]);
+        }
+        return findBufferAndMoveToTrace(index);
+    }
+
+    private ByteBuffer findBufferAndMoveToTrace(int traceIndex) {
+        MappedBuffer mappedBuffer = buffers.stream()
+                .filter(buffer -> traceIndex >= buffer.getFirstTraceIndex() &&
+                        traceIndex < buffer.getFirstTraceIndex() + buffer.getNumberOfTraces())
+                .findFirst()
+                .orElseThrow();
+        ByteBuffer buffer = mappedBuffer.getBuffer();
+        int traceIndexInBuffer = traceIndex - mappedBuffer.getFirstTraceIndex();
+        long positionInBuffer = traceIndexInBuffer * traceSize;
+        buffer.position((int) positionInBuffer);
+        return buffer;
+    }
+
+    private void mapBuffers() {
+        if (traceSize > 0) {
+            int tracesPerBuffer = (int) (Integer.MAX_VALUE / traceSize);
+            long maximumBufferSize = tracesPerBuffer * traceSize;
+
+            int firstTraceIndex = 0;
+            for (long offset = 0; offset < fileSize; offset += maximumBufferSize) {
+                buffers.add(mapBuffer(firstTraceIndex, maximumBufferSize));
+                firstTraceIndex += tracesPerBuffer;
+            }
+        }
+    }
+
+    private MappedBuffer mapBuffer(int firstTraceIndex, long bufferSize) {
+        try {
+            long bufferStart = firstTraceIndex * traceSize;
+            long limitedBufferSize = Math.min(fileSize - bufferStart, bufferSize);
+            MappedBuffer mappedBuffer = new MappedBuffer(this.channel.map(FileChannel.MapMode.READ_ONLY, readOffset + bufferStart, limitedBufferSize),
+                    firstTraceIndex,
+                    (int) (traceSize > 0 ? (limitedBufferSize / traceSize) : 0));
+            mappedBuffer.buffer.order(ByteOrder.LITTLE_ENDIAN);
+            return mappedBuffer;
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void close() {
+        buffers.clear();
+    }
+
+    private static class MappedBuffer {
+        private final ByteBuffer buffer;
+        private final int firstTraceIndex;
+        private final int numberOfTraces;
+
+        MappedBuffer(ByteBuffer buffer, int firstTraceIndex, int numberOfTraces) {
+            this.buffer = buffer;
+            this.firstTraceIndex = firstTraceIndex;
+            this.numberOfTraces = numberOfTraces;
+        }
+
+        public ByteBuffer getBuffer() {
+            return buffer;
+        }
+
+        public int getFirstTraceIndex() {
+            return firstTraceIndex;
+        }
+
+        public int getNumberOfTraces() {
+            return numberOfTraces;
+        }
+    }
+}
diff --git a/src/main/java/com/riscure/trs/TraceSet.java b/src/main/java/com/riscure/trs/TraceSet.java
index ee46acb..2de90ef 100644
--- a/src/main/java/com/riscure/trs/TraceSet.java
+++ b/src/main/java/com/riscure/trs/TraceSet.java
@@ -34,18 +34,21 @@ public class TraceSet implements AutoCloseable {
     private static final String TRACE_LENGTH_DIFFERS = "All traces in a set need to be the same length, but current trace length (%d) differs from the previous trace(s) (%d)";
     private static final String TRACE_DATA_LENGTH_DIFFERS = "All traces in a set need to have the same data length, but current trace data length (%d) differs from the previous trace(s) (%d)";
     private static final String UNKNOWN_SAMPLE_CODING = "Error reading TRS file: unknown sample coding '%d'";
-    private static final long MAX_BUFFER_SIZE = Integer.MAX_VALUE;
     private static final String PARAMETER_NOT_DEFINED = "Parameter %s is saved in the trace, but was not found in the header definition";
+    // This is excessive for the header, but it's only the initial maximum
+    private static final long MAX_METADATA_SIZE = 100_000_000L;
 
     //Reading variables
     private int metaDataSize;
     private FileInputStream readStream;
-    private FileChannel channel;
 
-    private ByteBuffer buffer;
+    private ByteBuffer metaDataBuffer;
+    private LargePreMappedFile mappedFile;
+    private float[] preallocatedSampleArray;
+    private byte[] preallocatedByteArray;
+    private short[] preallocatedShortArray;
+    private int[] preallocatedIntArray;
 
-    private long bufferStart;       //the byte index of the file where the buffer window starts
-    private long bufferSize;        //the number of bytes that are in the buffer window
     private long fileSize;          //the total number of bytes in the underlying file
 
     //Writing variables
@@ -66,16 +69,22 @@ private TraceSet(String inputFileName) throws IOException, TRSFormatException {
         this.open = true;
         this.path = Paths.get(inputFileName);
         this.readStream = new FileInputStream(inputFileName);
-        this.channel = readStream.getChannel();
+        FileChannel channel = readStream.getChannel();
 
         //the file might be bigger than the buffer, in which case we partially buffer it in memory
-        this.fileSize = this.channel.size();
-        this.bufferStart = 0L;
-        this.bufferSize = Math.min(fileSize, MAX_BUFFER_SIZE);
+        this.fileSize = channel.size();
+        long initialBufferSize = Math.min(fileSize, MAX_METADATA_SIZE);
 
-        mapBuffer();
-        this.metaData = TRSMetaDataUtils.readTRSMetaData(buffer);
-        this.metaDataSize = buffer.position();
+        this.metaDataBuffer = channel.map(FileChannel.MapMode.READ_ONLY, 0, initialBufferSize);
+        this.metaData = TRSMetaDataUtils.readTRSMetaData(metaDataBuffer);
+        this.metaDataSize = metaDataBuffer.position();
+        this.metaDataBuffer.limit(metaDataSize);
+
+        long traceSize = calculateTraceSize();
+        this.mappedFile = new LargePreMappedFile(channel, metaDataSize, traceSize);
+
+        int numberOfSamples = metaData.getInt(NUMBER_OF_SAMPLES);
+        this.preallocatedSampleArray = new float[numberOfSamples];
     }
 
     private TraceSet(String outputFileName, TRSMetaData metaData) throws FileNotFoundException {
@@ -93,23 +102,6 @@ public Path getPath() {
         return path;
     }
 
-    private void mapBuffer() throws IOException {
-        this.buffer = this.channel.map(FileChannel.MapMode.READ_ONLY, this.bufferStart, this.bufferSize);
-    }
-
-    private void moveBufferIfNecessary(int traceIndex) throws IOException {
-        long traceSize = calculateTraceSize();
-        long start = metaDataSize + (long) traceIndex * traceSize;
-        long end = start + traceSize;
-
-        boolean moveRequired = start < this.bufferStart || this.bufferStart + this.bufferSize < end;
-        if (moveRequired) {
-            this.bufferStart = start;
-            this.bufferSize = Math.min(this.fileSize - start, MAX_BUFFER_SIZE);
-            this.mapBuffer();
-        }
-    }
-
     private long calculateTraceSize() {
         int sampleSize = Encoding.fromValue(metaData.getInt(SAMPLE_CODING)).getSize();
         long sampleSpace = metaData.getInt(NUMBER_OF_SAMPLES) * (long) sampleSize;
@@ -140,12 +132,9 @@ public Trace get(int index) throws IOException {
             throw new IllegalStateException(msg);
         }
 
-        moveBufferIfNecessary(index);
-
-        long absolutePosition = metaDataSize + index * traceSize;
-        buffer.position((int) (absolutePosition - this.bufferStart));
+        ByteBuffer buffer = mappedFile.getBuffer(index);
 
-        String traceTitle = this.readTraceTitle();
+        String traceTitle = this.readTraceTitle(buffer);
         if (traceTitle.trim().isEmpty()) {
             traceTitle = String.format("%s %d", metaData.getString(GLOBAL_TITLE), index);
         }
@@ -160,15 +149,16 @@ public Trace get(int index) throws IOException {
                 traceParameterMap = TraceParameterMap.deserialize(data, traceParameterDefinitionMap);
             } else {
                 //legacy mode
-                byte[] data = readData();
+                byte[] data = readData(buffer);
                 traceParameterMap = new TraceParameterMap();
                 if (data.length > 0) {
                     traceParameterMap.put("LEGACY_DATA", data);
                 }
             }
 
-            float[] samples = readSamples();
-            return new Trace(traceTitle, samples, traceParameterMap);
+            float[] samples = readSamples(buffer);
+            // Since we are using an internal sample array in this class, Trace.create() should duplicate it internally
+            return Trace.create(traceTitle, samples, traceParameterMap);
         } catch (TRSFormatException ex) {
             throw new IOException(ex);
         }
@@ -339,7 +329,8 @@ private void checkValid(Trace trace) {
     }
 
     private void closeReader() throws IOException {
-        buffer = null;
+        metaDataBuffer = null;
+        mappedFile.close();
         readStream.close();
     }
 
@@ -362,75 +353,59 @@ public TRSMetaData getMetaData() {
         return metaData;
     }
 
-    protected String readTraceTitle() {
+    protected String readTraceTitle(ByteBuffer buffer) {
         byte[] titleArray = new byte[metaData.getInt(TITLE_SPACE)];
         buffer.get(titleArray);
         return new String(titleArray);
     }
 
-    protected byte[] readData() {
+    protected byte[] readData(ByteBuffer buffer) {
         int inputSize = metaData.getInt(DATA_LENGTH);
         byte[] comDataArray = new byte[inputSize];
         buffer.get(comDataArray);
         return comDataArray;
     }
 
-    protected float[] readSamples() throws TRSFormatException {
-        buffer.order(ByteOrder.LITTLE_ENDIAN);
-        int numberOfSamples = metaData.getInt(NUMBER_OF_SAMPLES);
-        float[] samples;
+    /*
+     * We can reuse the buffers when not dealing with float samples. They are instantiated once just in time if needed.
+     */
+    protected float[] readSamples(ByteBuffer buffer) throws TRSFormatException {
         switch (Encoding.fromValue(metaData.getInt(SAMPLE_CODING))) {
             case BYTE:
-                byte[] byteData = new byte[numberOfSamples];
-                buffer.get(byteData);
-                samples = toFloatArray(byteData);
+                this.preallocatedByteArray = this.preallocatedByteArray == null ? new byte[preallocatedSampleArray.length] : this.preallocatedByteArray;
+                buffer.get(preallocatedByteArray);
+                // Manual copy of byte[] into float[]
+                for (int k = 0; k < preallocatedSampleArray.length; k++) {
+                    preallocatedSampleArray[k] = preallocatedByteArray[k];
+                }
                 break;
             case SHORT:
+                this.preallocatedShortArray = this.preallocatedShortArray == null ? new short[preallocatedSampleArray.length] : this.preallocatedShortArray;
                 ShortBuffer shortView = buffer.asShortBuffer();
-                short[] shortData = new short[numberOfSamples];
-                shortView.get(shortData);
-                samples = toFloatArray(shortData);
+                shortView.get(preallocatedShortArray);
+                // Manual copy of short[] into float[]
+                for (int k = 0; k < preallocatedSampleArray.length; k++) {
+                    preallocatedSampleArray[k] = preallocatedShortArray[k];
+                }
                 break;
             case FLOAT:
                 FloatBuffer floatView = buffer.asFloatBuffer();
-                samples = new float[numberOfSamples];
-                floatView.get(samples);
+                floatView.get(preallocatedSampleArray);
                 break;
             case INT:
+                this.preallocatedIntArray = this.preallocatedIntArray == null ? new int[preallocatedSampleArray.length] : this.preallocatedIntArray;
                 IntBuffer intView = buffer.asIntBuffer();
-                int[] intData = new int[numberOfSamples];
-                intView.get(intData);
-                samples = toFloatArray(intData);
+                intView.get(preallocatedIntArray);
+                // Manual copy of int[] into float[]
+                for (int k = 0; k < preallocatedIntArray.length; k++) {
+                    preallocatedSampleArray[k] = (float) preallocatedIntArray[k];
+                }
                 break;
             default:
                 throw new TRSFormatException(String.format(UNKNOWN_SAMPLE_CODING, metaData.getInt(SAMPLE_CODING)));
         }
 
-        return samples;
-    }
-
-    private float[] toFloatArray(byte[] numbers) {
-        float[] result = new float[numbers.length];
-        for (int k = 0; k < numbers.length; k++) {
-            result[k] = numbers[k];
-        }
-        return result;
-    }
-
-    private float[] toFloatArray(int[] numbers) {
-        float[] result = new float[numbers.length];
-        for (int k = 0; k < numbers.length; k++) {
-            result[k] = (float) numbers[k];
-        }
-        return result;
-    }
-
-    private float[] toFloatArray(short[] numbers) {
-        float[] result = new float[numbers.length];
-        for (int k = 0; k < numbers.length; k++) {
-            result[k] = numbers[k];
-        }
-        return result;
+        return preallocatedSampleArray;
     }
 
     /**