Updated to use RandomAccessFileWrapper