diff --git a/SPEC/FILES.md b/SPEC/FILES.md
index b9b6aaf1..585c15a5 100644
--- a/SPEC/FILES.md
+++ b/SPEC/FILES.md
@@ -24,6 +24,7 @@ The regular, top-level API for add, cat, get and ls Files on IPFS
 The Files API, aka MFS (Mutable File System)
 
 _Explore the Mutable File System through interactive coding challenges in our [ProtoSchool tutorial](https://proto.school/#/mutable-file-system/)._
+  - [files.chmod](#fileschmod)
   - [files.cp](#filescp)
   - [files.flush](#filesflush)
   - [files.ls](#filesls)
@@ -36,6 +37,7 @@ _Explore the Mutable File System through interactive coding challenges in our [P
   - [files.readReadableStream](#filesreadreadablestream)
   - [files.rm](#filesrm)
   - [files.stat](#filesstat)
+  - [files.touch](#filestouch)
   - [files.write](#fileswrite)
 
 ### ⚠️ Note
@@ -58,6 +60,8 @@ Where `data` may be:
 {
     path: '/tmp/myfile.txt', // The file path
     content: <data> // A Buffer, Readable Stream, Pull Stream or File with the contents of the file
+    mode: <Number> // optional integer mode to store the entry with
+    mtime: <time> // optional value representing the modification time of the entry - either a `Date` object, an object with `{ secs, nsecs }` properties where `secs` is the number of seconds since (positive) or before (negative) the Unix Epoch began and `nsecs` is the number of nanoseconds since the last full second, or the output of `process.hrtime()`
 }
 ```
 If no `content` is passed, then the path is treated as an empty directory
@@ -98,6 +102,8 @@ an array of objects is returned, each of the form:
 {
   path: '/tmp/myfile.txt',
   hash: 'QmHash', // base58 encoded multihash
+  mode: Number,
+  mtime: { secs: Number, nsecs: Number },
   size: 123
 }
 ```
@@ -130,16 +136,20 @@ const results = await ipfs.add(files)
 
 The `results` array:
 
-```json
+```javascript
 [
   {
     "path": "tmp",
     "hash": "QmWXdjNC362aPDtwHPUE9o2VMqPeNeCQuTBTv1NsKtwypg",
+    "mode": 493,
+    "mtime": { secs: Number, nsecs: Number },
     "size": 67
   },
   {
     "path": "/tmp/myfile.txt",
     "hash": "QmNz1UBzpdd4HfZ3qir3aPiRdX5a93XwTuDNyXRc6PKhWW",
+    "mode": 420,
+    "mtime": { secs: Number, nsecs: Number },
     "size": 11
   }
 ]
@@ -179,6 +189,8 @@ stream.on('data', function (file) {
   // {
   //   path: '/tmp/myfile.txt',
   //   hash: 'QmHash' // base58 encoded multihash
+  //   mode: Number,
+  //   mtime: { secs: Number, nsecs: Number },
   //   size: 123
   // }
 })
@@ -207,6 +219,8 @@ Returns a Pull Stream, where objects can be written of the forms
 {
   path: '/tmp/myfile.txt', // The file path
   content: <data> // A Buffer, Readable Stream, Pull Stream or File with the contents of the file
+  mode: <Number> // optional integer mode to store the entry with
+  mtime: <time> // optional value representing the modification time of the entry - either a `Date` object, an object with `{ secs, nsecs }` properties where `secs` is the number of seconds since (positive) or before (negative) the Unix Epoch began and `nsecs` is the number of nanoseconds since the last full second, or the output of `process.hrtime()`
 }
 ```
 
@@ -233,6 +247,8 @@ pull(
     // {
     //   path: '/tmp/myfile.txt',
     //   hash: 'QmHash' // base58 encoded multihash
+    //   mode: Number
+    //   mtime: { secs: Number, nsecs: Number }
     //   size: 123
     // }
   })
@@ -264,6 +280,8 @@ an array of objects is returned, each of the form:
 {
   path: 'test-folder',
   hash: 'QmRNjDeKStKGTQXnJ2NFqeQ9oW23WcpbmvCVrpDHgDg3T6',
+  mode: Number
+  mtime: Date
   size: 123
 }
 ```
@@ -318,6 +336,8 @@ an array of objects is returned, each of the form:
 {
   path: '/tmp/myfile.txt',
   hash: 'QmHash', // base58 encoded multihash
+  mode: Number,
+  mtime: { secs: Number, nsecs: Number },
   size: 123
 }
 ```
@@ -511,7 +531,9 @@ the yielded objects are of the form:
 ```js
 {
   path: '/tmp/myfile.txt',
-  content: <Readable stream>
+  content: <Readable stream>,
+  mode: Number,
+  mtime: { secs: Number, nsecs: Number }
 }
 ```
 
@@ -563,7 +585,9 @@ the yielded objects are of the form:
 ```js
 {
   path: '/tmp/myfile.txt',
-  content: <Pull Stream>
+  content: <Pull Stream>,
+  mode: Number,
+  mtime: { secs: Number, nsecs: Number }
 }
 ```
 
@@ -624,7 +648,9 @@ an array of objects is returned, each of the form:
   path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/alice.txt',
   size: 11696,
   hash: 'QmZyUEQVuRK3XV7L9Dk26pg6RVSgaYkiSTEdnT2kZZdwoi',
-  type: 'file'
+  type: 'file',
+  mode: Number,
+  mtime: { secs: Number, nsecs: Number }
 }
 ```
 
@@ -674,7 +700,9 @@ the yielded objects are of the form:
   path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/alice.txt',
   size: 11696,
   hash: 'QmZyUEQVuRK3XV7L9Dk26pg6RVSgaYkiSTEdnT2kZZdwoi',
-  type: 'file'
+  type: 'file',
+  mode: Number,
+  mtime: { secs: Number, nsecs: Number }
 }
 ```
 
@@ -727,7 +755,9 @@ the yielded objects are of the form:
   path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/alice.txt',
   size: 11696,
   hash: 'QmZyUEQVuRK3XV7L9Dk26pg6RVSgaYkiSTEdnT2kZZdwoi',
-  type: 'file'
+  type: 'file',
+  mode: Number,
+  mtime: { secs: Number, nsecs: Number }
 }
 ```
 
@@ -759,6 +789,46 @@ A great source of [examples][] can be found in the tests for this API.
 
 The Mutable File System (MFS) is a virtual file system on top of IPFS that exposes a Unix like API over a virtual directory. It enables users to write and read from paths without having to worry about updating the graph. It enables things like [ipfs-blob-store](https://github.com/ipfs/ipfs-blob-store) to exist.
 
+#### `files.chmod`
+
+> Change mode for files and directories
+
+##### `ipfs.files.chmod(path, mode, [options])`
+
+Where:
+
+- `path` is the path to the entry to modify.  It might be:
+  - An existing MFS path to a file or a directory (e.g. `/my-dir/my-file.txt`)
+  - An IPFS path (e.g. `/ipfs/QmWGeRAEgtsHW3ec7U4qW2CyVy7eA2mFRVbk1nb24jFyks`)
+  - A [CID][cid] instance (e.g. `new CID('QmWGeRAEgtsHW3ec7U4qW2CyVy7eA2mFRVbk1nb24jFyks')`)
+- `mode` is the new file mode.  It might be:
+  - A string modification of the existing mode, e.g. `'a+x'`, `'g-w'`, etc
+  - An integer, e.g. the returned value from `parseInt('0755', 8)` or `0o755`
+- `options` is an optional Object that might contain the following keys:
+  - `recursive` is a Boolean value that indicates if `mode` should be applied to all sub files/directories of `path` (default: false)
+  - `hashAlg` is which algorithm to use when creating CIDs for modified entries. (default: `sha2-256`) [The list of all possible values]( https://github.com/multiformats/js-multihash/blob/master/src/constants.js#L5-L343)
+  - `flush` is a Boolean value to decide whether or not to immediately flush MFS changes to disk (default: true)
+  - `cidVersion`: the CID version to use for any updated entries (integer, default 0)
+
+**Returns**
+
+| Type | Description |
+| -------- | -------- |
+| `Promise<void>` | If action is successfully completed. Otherwise an error will be thrown |
+
+**Example:**
+
+```JavaScript
+// To give a file -rwxrwxrwx permissions
+await ipfs.files.chmod('/path/to/file.txt', parseInt('0777', 8))
+
+// Alternatively
+await ipfs.files.chmod('/path/to/file.txt', '+rwx')
+
+// You can omit the leading `0` too
+await ipfs.files.chmod('/path/to/file.txt', '777')
+```
+
 #### `files.cp`
 
 > Copy files.
@@ -821,6 +891,8 @@ Where:
   - `format` is what type of nodes to write any newly created directories as (default: `dag-pb`)
   - `hashAlg` is which algorithm to use when creating CIDs for newly created directories (default: `sha2-256`) [The list of all possible values]( https://github.com/multiformats/js-multihash/blob/master/src/constants.js#L5-L343)
   - `flush` is a Boolean value to decide whether or not to immediately flush MFS changes to disk  (default: true)
+  - `mode`: optional UnixFS mode to create the directory with - a number or a string that will be interpreted as a base 8 number
+  - `mtime`: A Date object, an object with `{ secs, nsecs }` properties where `secs` is the number of seconds since (positive) or before (negative) the Unix Epoch began and `nsecs` is the number of nanoseconds since the last full second, or the output of [`process.hrtime()`](https://nodejs.org/api/process.html#process_process_hrtime_time)
 
 **Returns**
 
@@ -884,6 +956,42 @@ console.log(stats)
 // }
 ```
 
+#### `files.touch`
+
+> Update the mtime of a file or directory
+
+##### `ipfs.files.touch(path, [options])`
+
+Where:
+
+- `path` is the path to the file or directory to update. It might be:
+  - An existing MFS path to a file or directory (e.g. `/my-dir/a.txt`)
+  - An IPFS path (e.g. `/ipfs/QmWGeRAEgtsHW3ec7U4qW2CyVy7eA2mFRVbk1nb24jFyks`)
+  - A [CID][cid] instance (e.g. `new CID('QmWGeRAEgtsHW3ec7U4qW2CyVy7eA2mFRVbk1nb24jFyks')`)
+- `options` is an optional Object that might contain the following keys:
+  - `mtime` Either a ` Date` object, an object with `{ sec, nsecs }` properties or the output of `process.hrtime()`  (default: now)
+  - `hashAlg` is which algorithm to use when creating CIDs for modified entries. (default: `sha2-256`) [The list of all possible values]( https://github.com/multiformats/js-multihash/blob/master/src/constants.js#L5-L343)
+  - `flush` is a Boolean value to decide whether or not to immediately flush MFS changes to disk (default: true)
+  - `cidVersion`: the CID version to use for any updated entries (integer, default 0)
+
+**Returns**
+
+| Type | Description |
+| -------- | -------- |
+| `Promise<void>` | If action is successfully completed. Otherwise an error will be thrown |
+
+**Example:**
+
+```JavaScript
+// set the mtime to the current time
+await ipfs.files.touch('/path/to/file.txt')
+
+// set the mtime to a specific time
+await ipfs.files.touch('/path/to/file.txt', {
+  mtime: new Date('May 23, 2014 14:45:14 -0700')
+})
+```
+
 #### `files.rm`
 
 > Remove a file or directory.
@@ -1036,6 +1144,8 @@ Where:
   - `length` is an Integer with the maximum number of bytes to read (default: Read all bytes from `content`)
   - `rawLeaves`: if true, DAG leaves will contain raw file data and not be wrapped in a protobuf (boolean, default false)
   - `cidVersion`: the CID version to use when storing the data (storage keys are based on the CID, including its version) (integer, default 0)
+  - `mode`: optional UnixFS mode to create or update the file with - a number or a string that will be interpreted as a base 8 number
+  - `mtime`: A Date object, an object with `{ sec, nsecs }` properties or the output of `process.hrtime()` or `process.hrtime.bigint()`
 
 **Returns**
 
@@ -1144,6 +1254,8 @@ each object contains the following keys:
 - `type` which is the object's type (`directory` or `file`)
 - `size` the size of the file in bytes
 - `hash` the hash of the file
+- `mode` the UnixFS mode as a Number
+- `mtime` an objects with numeric `secs` and `nsecs` properties
 
 **Example:**
 
@@ -1188,6 +1300,8 @@ the yielded objects contain the following keys:
 - `type` which is the object's type (`directory` or `file`)
 - `size` the size of the file in bytes
 - `hash` the hash of the file
+- `mode` the UnixFS mode as a Number
+- `mtime` an object with numeric `secs` and `nsecs` properties
 
 **Example:**
 
@@ -1230,6 +1344,8 @@ the yielded objects contain the following keys:
   - `type` which is the object's type (`directory` or `file`)
   - `size` the size of the file in bytes
   - `hash` the hash of the file
+  - `mode` the UnixFS mode as a Number
+  - `mtime` an object with numeric `secs` and `nsecs` properties
 
 **Example:**
 
diff --git a/package.json b/package.json
index 8fc655fa..fbe453e1 100644
--- a/package.json
+++ b/package.json
@@ -49,8 +49,8 @@
     "get-stream": "^5.1.0",
     "hat": "0.0.3",
     "ipfs-block": "~0.8.0",
-    "ipfs-unixfs": "~0.1.16",
-    "ipfs-utils": "~0.4.0",
+    "ipfs-unixfs": "^0.3.0",
+    "ipfs-utils": "^0.4.2",
     "ipld-dag-cbor": "~0.15.0",
     "ipld-dag-pb": "^0.18.1",
     "is-ipfs": "~0.6.1",
diff --git a/src/files-mfs/chmod.js b/src/files-mfs/chmod.js
new file mode 100644
index 00000000..7c0372bf
--- /dev/null
+++ b/src/files-mfs/chmod.js
@@ -0,0 +1,62 @@
+/* eslint-env mocha */
+'use strict'
+
+const hat = require('hat')
+const { getDescribe, getIt, expect } = require('../utils/mocha')
+
+module.exports = (common, options) => {
+  const describe = getDescribe(options)
+  const it = getIt(options)
+
+  describe('.files.chmod', function () {
+    this.timeout(40 * 1000)
+
+    let ipfs
+
+    async function testMode (mode, expectedMode) {
+      const testPath = `/test-${hat()}`
+
+      await ipfs.files.write(testPath, Buffer.from('Hello, world!'), {
+        create: true
+      })
+      await ipfs.files.chmod(testPath, mode)
+
+      const stat = await ipfs.files.stat(testPath)
+      expect(stat).to.have.property('mode').that.equals(expectedMode)
+    }
+
+    before(async () => {
+      ipfs = (await common.spawn()).api
+    })
+
+    after(() => common.clean())
+
+    it('should change file mode', async function () {
+      const mode = parseInt('544', 8)
+      await testMode(mode, mode)
+    })
+
+    it('should change file mode as string', async function () {
+      const mode = parseInt('544', 8)
+      await testMode('544', mode)
+    })
+
+    it('should change file mode to 0', async function () {
+      const mode = 0
+      await testMode(mode, mode)
+    })
+
+    it('should change directory mode', async function () {
+      const testPath = `/test-${hat()}`
+      const mode = parseInt('544', 8)
+
+      await ipfs.files.mkdir(testPath, {
+        create: true
+      })
+      await ipfs.files.chmod(testPath, mode)
+
+      const stat = await ipfs.files.stat(testPath)
+      expect(stat).to.have.property('mode').that.equals(mode)
+    })
+  })
+}
diff --git a/src/files-mfs/cp.js b/src/files-mfs/cp.js
index 0515d83e..3b13e042 100644
--- a/src/files-mfs/cp.js
+++ b/src/files-mfs/cp.js
@@ -59,5 +59,76 @@ module.exports = (common, options) => {
       const testFileData = await ipfs.files.read(testFilePath)
       expect(testFileData).to.eql(fixtures.smallFile.data)
     })
+
+    it('should respect metadata when copying files', async function () {
+      const testSrcPath = `/test-${hat()}`
+      const testDestPath = `/test-${hat()}`
+      const mode = parseInt('0321', 8)
+      const mtime = new Date()
+      const seconds = Math.floor(mtime.getTime() / 1000)
+      const expectedMtime = {
+        secs: seconds,
+        nsecs: (mtime - (seconds * 1000)) * 1000
+      }
+
+      await ipfs.files.write(testSrcPath, Buffer.from('TEST'), {
+        create: true,
+        mode,
+        mtime
+      })
+      await ipfs.files.cp(testSrcPath, testDestPath)
+
+      const stats = await ipfs.files.stat(testDestPath)
+      expect(stats).to.have.deep.property('mtime', expectedMtime)
+      expect(stats).to.have.property('mode', mode)
+    })
+
+    it('should respect metadata when copying directories', async function () {
+      const testSrcPath = `/test-${hat()}`
+      const testDestPath = `/test-${hat()}`
+      const mode = parseInt('0321', 8)
+      const mtime = new Date()
+      const seconds = Math.floor(mtime.getTime() / 1000)
+      const expectedMtime = {
+        secs: seconds,
+        nsecs: (mtime - (seconds * 1000)) * 1000
+      }
+
+      await ipfs.files.mkdir(testSrcPath, {
+        mode,
+        mtime
+      })
+      await ipfs.files.cp(testSrcPath, testDestPath, {
+        recursive: true
+      })
+
+      const stats = await ipfs.files.stat(testDestPath)
+      expect(stats).to.have.deep.property('mtime', expectedMtime)
+      expect(stats).to.have.property('mode', mode)
+    })
+
+    it('should respect metadata when copying from outside of mfs', async function () {
+      const testDestPath = `/test-${hat()}`
+      const mode = parseInt('0321', 8)
+      const mtime = new Date()
+      const seconds = Math.floor(mtime.getTime() / 1000)
+      const expectedMtime = {
+        secs: seconds,
+        nsecs: (mtime - (seconds * 1000)) * 1000
+      }
+
+      const [{
+        hash
+      }] = await ipfs.add({
+        content: fixtures.smallFile.data,
+        mode,
+        mtime
+      })
+      await ipfs.files.cp(`/ipfs/${hash}`, testDestPath)
+
+      const stats = await ipfs.files.stat(testDestPath)
+      expect(stats).to.have.deep.property('mtime', expectedMtime)
+      expect(stats).to.have.property('mode', mode)
+    })
   })
 }
diff --git a/src/files-mfs/index.js b/src/files-mfs/index.js
index 6f70a80d..a5ba1bd1 100644
--- a/src/files-mfs/index.js
+++ b/src/files-mfs/index.js
@@ -3,6 +3,7 @@
 const { createSuite } = require('../utils/suite')
 
 const tests = {
+  chmod: require('./chmod'),
   mkdir: require('./mkdir'),
   write: require('./write'),
   cp: require('./cp'),
@@ -15,7 +16,8 @@ const tests = {
   ls: require('./ls'),
   lsReadableStream: require('./ls-readable-stream'),
   lsPullStream: require('./ls-pull-stream'),
-  flush: require('./flush')
+  flush: require('./flush'),
+  touch: require('./touch')
 }
 
 module.exports = createSuite(tests)
diff --git a/src/files-mfs/ls-pull-stream.js b/src/files-mfs/ls-pull-stream.js
index 0674fa7b..d3a56599 100644
--- a/src/files-mfs/ls-pull-stream.js
+++ b/src/files-mfs/ls-pull-stream.js
@@ -40,10 +40,15 @@ module.exports = (common, options) => {
 
       const entries = await pullToPromise.any(ipfs.files.lsPullStream(testDir))
 
-      expect(entries.sort((a, b) => a.name.localeCompare(b.name))).to.eql([
-        { name: 'b', type: 0, size: 0, hash: '' },
-        { name: 'lv1', type: 0, size: 0, hash: '' }
-      ])
+      expect(entries).to.have.lengthOf(2)
+      expect(entries).to.have.nested.property('[0].name', 'b')
+      expect(entries).to.have.nested.property('[0].type', 0)
+      expect(entries).to.have.nested.property('[0].size', 0)
+      expect(entries).to.have.nested.property('[0].hash', '')
+      expect(entries).to.have.nested.property('[1].name', 'lv1')
+      expect(entries).to.have.nested.property('[1].type', 0)
+      expect(entries).to.have.nested.property('[1].size', 0)
+      expect(entries).to.have.nested.property('[1].hash', '')
     })
 
     it('should ls directory with long option', async () => {
@@ -54,20 +59,15 @@ module.exports = (common, options) => {
 
       const entries = await pullToPromise.any(ipfs.files.lsPullStream(testDir, { long: true }))
 
-      expect(entries.sort((a, b) => a.name.localeCompare(b.name))).to.eql([
-        {
-          name: 'b',
-          type: 0,
-          size: 13,
-          hash: 'QmcZojhwragQr5qhTeFAmELik623Z21e3jBTpJXoQ9si1T'
-        },
-        {
-          name: 'lv1',
-          type: 1,
-          size: 0,
-          hash: 'QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn'
-        }
-      ])
+      expect(entries).to.have.lengthOf(2)
+      expect(entries).to.have.nested.property('[0].name', 'b')
+      expect(entries).to.have.nested.property('[0].type', 0)
+      expect(entries).to.have.nested.property('[0].size', 13)
+      expect(entries).to.have.nested.property('[0].hash', 'QmcZojhwragQr5qhTeFAmELik623Z21e3jBTpJXoQ9si1T')
+      expect(entries).to.have.nested.property('[1].name', 'lv1')
+      expect(entries).to.have.nested.property('[1].type', 1)
+      expect(entries).to.have.nested.property('[1].size', 0)
+      expect(entries).to.have.nested.property('[1].hash', 'QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn')
     })
   })
 }
diff --git a/src/files-mfs/ls-readable-stream.js b/src/files-mfs/ls-readable-stream.js
index fab1c3ad..9360b56d 100644
--- a/src/files-mfs/ls-readable-stream.js
+++ b/src/files-mfs/ls-readable-stream.js
@@ -43,10 +43,15 @@ module.exports = (common, options) => {
 
       const entries = await getStream.array(stream)
 
-      expect(entries.sort((a, b) => a.name.localeCompare(b.name))).to.eql([
-        { name: 'b', type: 0, size: 0, hash: '' },
-        { name: 'lv1', type: 0, size: 0, hash: '' }
-      ])
+      expect(entries).to.have.lengthOf(2)
+      expect(entries).to.have.nested.property('[0].name', 'b')
+      expect(entries).to.have.nested.property('[0].type', 0)
+      expect(entries).to.have.nested.property('[0].size', 0)
+      expect(entries).to.have.nested.property('[0].hash', '')
+      expect(entries).to.have.nested.property('[1].name', 'lv1')
+      expect(entries).to.have.nested.property('[1].type', 0)
+      expect(entries).to.have.nested.property('[1].size', 0)
+      expect(entries).to.have.nested.property('[1].hash', '')
     })
 
     it('should ls directory with long option', async () => {
@@ -58,20 +63,15 @@ module.exports = (common, options) => {
       const stream = ipfs.files.lsReadableStream(testDir, { long: true })
       const entries = await getStream.array(stream)
 
-      expect(entries.sort((a, b) => a.name.localeCompare(b.name))).to.eql([
-        {
-          name: 'b',
-          type: 0,
-          size: 13,
-          hash: 'QmcZojhwragQr5qhTeFAmELik623Z21e3jBTpJXoQ9si1T'
-        },
-        {
-          name: 'lv1',
-          type: 1,
-          size: 0,
-          hash: 'QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn'
-        }
-      ])
+      expect(entries).to.have.lengthOf(2)
+      expect(entries).to.have.nested.property('[0].name', 'b')
+      expect(entries).to.have.nested.property('[0].type', 0)
+      expect(entries).to.have.nested.property('[0].size', 13)
+      expect(entries).to.have.nested.property('[0].hash', 'QmcZojhwragQr5qhTeFAmELik623Z21e3jBTpJXoQ9si1T')
+      expect(entries).to.have.nested.property('[1].name', 'lv1')
+      expect(entries).to.have.nested.property('[1].type', 1)
+      expect(entries).to.have.nested.property('[1].size', 0)
+      expect(entries).to.have.nested.property('[1].hash', 'QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn')
     })
   })
 }
diff --git a/src/files-mfs/ls.js b/src/files-mfs/ls.js
index 5497f49a..7ee5a530 100644
--- a/src/files-mfs/ls.js
+++ b/src/files-mfs/ls.js
@@ -35,12 +35,17 @@ module.exports = (common, options) => {
       await ipfs.files.mkdir(`${testDir}/lv1`, { parents: true })
       await ipfs.files.write(`${testDir}/b`, Buffer.from('Hello, world!'), { create: true })
 
-      const info = await ipfs.files.ls(testDir)
-
-      expect(info.sort((a, b) => a.name.localeCompare(b.name))).to.eql([
-        { name: 'b', type: 0, size: 0, hash: '' },
-        { name: 'lv1', type: 0, size: 0, hash: '' }
-      ])
+      const entries = await ipfs.files.ls(testDir)
+
+      expect(entries).to.have.lengthOf(2)
+      expect(entries).to.have.nested.property('[0].name', 'b')
+      expect(entries).to.have.nested.property('[0].type', 0)
+      expect(entries).to.have.nested.property('[0].size', 0)
+      expect(entries).to.have.nested.property('[0].hash', '')
+      expect(entries).to.have.nested.property('[1].name', 'lv1')
+      expect(entries).to.have.nested.property('[1].type', 0)
+      expect(entries).to.have.nested.property('[1].size', 0)
+      expect(entries).to.have.nested.property('[1].hash', '')
     })
 
     it('should ls directory with long option', async () => {
@@ -49,22 +54,50 @@ module.exports = (common, options) => {
       await ipfs.files.mkdir(`${testDir}/lv1`, { parents: true })
       await ipfs.files.write(`${testDir}/b`, Buffer.from('Hello, world!'), { create: true })
 
-      const info = await ipfs.files.ls(testDir, { long: true })
-
-      expect(info.sort((a, b) => a.name.localeCompare(b.name))).to.eql([
-        {
-          name: 'b',
-          type: 0,
-          size: 13,
-          hash: 'QmcZojhwragQr5qhTeFAmELik623Z21e3jBTpJXoQ9si1T'
-        },
-        {
-          name: 'lv1',
-          type: 1,
-          size: 0,
-          hash: 'QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn'
+      const entries = await ipfs.files.ls(testDir, { long: true })
+
+      expect(entries).to.have.lengthOf(2)
+      expect(entries).to.have.nested.property('[0].name', 'b')
+      expect(entries).to.have.nested.property('[0].type', 0)
+      expect(entries).to.have.nested.property('[0].size', 13)
+      expect(entries).to.have.nested.property('[0].hash', 'QmcZojhwragQr5qhTeFAmELik623Z21e3jBTpJXoQ9si1T')
+      expect(entries).to.have.nested.property('[1].name', 'lv1')
+      expect(entries).to.have.nested.property('[1].type', 1)
+      expect(entries).to.have.nested.property('[1].size', 0)
+      expect(entries).to.have.nested.property('[1].hash', 'QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn')
+    })
+
+    it('ls directory with long option should include metadata', async () => {
+      const testDir = `/test-${hat()}`
+
+      await ipfs.files.mkdir(`${testDir}/lv1`, {
+        parents: true,
+        mtime: {
+          secs: 5
+        }
+      })
+      await ipfs.files.write(`${testDir}/b`, Buffer.from('Hello, world!'), {
+        create: true,
+        mtime: {
+          secs: 5
         }
-      ])
+      })
+
+      const entries = await ipfs.files.ls(testDir, { long: true })
+
+      expect(entries).to.have.lengthOf(2)
+      expect(entries).to.have.nested.property('[0].hash', 'QmTVnczjg445RUAEYNH1wvhVa2rnPoWMfHMxQc6W7HHoyM')
+      expect(entries).to.have.nested.property('[0].mode', 0o0644)
+      expect(entries).to.have.nested.deep.property('[0].mtime', {
+        secs: 5,
+        nsecs: 0
+      })
+      expect(entries).to.have.nested.property('[1].hash', 'QmXkBjmbtWUxXLa3s541UBSzPgvaAR7b8X3Amcp5D1VKTQ')
+      expect(entries).to.have.nested.property('[1].mode', 0o0755)
+      expect(entries).to.have.nested.deep.property('[1].mtime', {
+        secs: 5,
+        nsecs: 0
+      })
     })
 
     it('should ls from outside of mfs', async () => {
@@ -85,20 +118,19 @@ module.exports = (common, options) => {
       expect(contents).to.be.an('array').and.to.be.empty()
     })
 
-    it('should list an file directly', async () => {
+    it('should list a file directly', async () => {
       const fileName = `single-file-${hat()}.txt`
       const filePath = `/${fileName}`
       await ipfs.files.write(filePath, Buffer.from('Hello world'), {
         create: true
       })
-      const contents = await ipfs.files.ls(filePath)
-
-      expect(contents).to.be.an('array').and.have.lengthOf(1).and.to.deep.equal([{
-        hash: '',
-        name: fileName,
-        size: 0,
-        type: 0
-      }])
+      const entries = await ipfs.files.ls(filePath)
+
+      expect(entries).to.have.lengthOf(1)
+      expect(entries).to.have.nested.property('[0].name', fileName)
+      expect(entries).to.have.nested.property('[0].type', 0)
+      expect(entries).to.have.nested.property('[0].size', 0)
+      expect(entries).to.have.nested.property('[0].hash', '')
     })
   })
 }
diff --git a/src/files-mfs/mkdir.js b/src/files-mfs/mkdir.js
index 0c35e5ec..df30130e 100644
--- a/src/files-mfs/mkdir.js
+++ b/src/files-mfs/mkdir.js
@@ -18,6 +18,26 @@ module.exports = (common, options) => {
 
     let ipfs
 
+    async function testMode (mode, expectedMode) {
+      const testPath = `/test-${hat()}`
+      await ipfs.files.mkdir(testPath, {
+        mode
+      })
+
+      const stats = await ipfs.files.stat(testPath)
+      expect(stats).to.have.property('mode', expectedMode)
+    }
+
+    async function testMtime (mtime, expectedMtime) {
+      const testPath = `/test-${hat()}`
+      await ipfs.files.mkdir(testPath, {
+        mtime
+      })
+
+      const stats = await ipfs.files.stat(testPath)
+      expect(stats).to.have.deep.property('mtime', expectedMtime)
+    }
+
     before(async () => { ipfs = (await common.spawn()).api })
 
     after(() => common.clean())
@@ -37,5 +57,53 @@ module.exports = (common, options) => {
     it('should not make already existent directory', () => {
       return expect(ipfs.files.mkdir('/')).to.eventually.be.rejected()
     })
+
+    it('should make directory and have default mode', async function () {
+      await testMode(undefined, parseInt('0755', 8))
+    })
+
+    it('should make directory and specify mode as string', async function () {
+      const mode = '0321'
+      await testMode(mode, parseInt(mode, 8))
+    })
+
+    it('should make directory and specify mode as number', async function () {
+      const mode = parseInt('0321', 8)
+      await testMode(mode, mode)
+    })
+
+    it('should make directory and specify mtime as Date', async function () {
+      const mtime = new Date(5000)
+      await testMtime(mtime, {
+        secs: 5,
+        nsecs: 0
+      })
+    })
+
+    it('should make directory and specify mtime as { nsecs, secs }', async function () {
+      const mtime = {
+        secs: 5,
+        nsecs: 0
+      }
+      await testMtime(mtime, mtime)
+    })
+
+    it('should make directory and specify mtime as timespec', async function () {
+      await testMtime({
+        Seconds: 5,
+        FractionalNanoseconds: 0
+      }, {
+        secs: 5,
+        nsecs: 0
+      })
+    })
+
+    it('should make directory and specify mtime as hrtime', async function () {
+      const mtime = process.hrtime()
+      await testMtime(mtime, {
+        secs: mtime[0],
+        nsecs: mtime[1]
+      })
+    })
   })
 }
diff --git a/src/files-mfs/stat.js b/src/files-mfs/stat.js
index 9640b30d..d768adf2 100644
--- a/src/files-mfs/stat.js
+++ b/src/files-mfs/stat.js
@@ -62,8 +62,6 @@ module.exports = (common, options) => {
         type: 'directory',
         blocks: 1,
         size: 0,
-        hash: 'QmQGn7EvzJZRbhcwHrp4UeMeS56WsLmrey9JhfkymjzXQu',
-        cumulativeSize: 118,
         withLocality: false
       })
       expect(stat.local).to.be.undefined()
diff --git a/src/files-mfs/touch.js b/src/files-mfs/touch.js
new file mode 100644
index 00000000..aec4c76c
--- /dev/null
+++ b/src/files-mfs/touch.js
@@ -0,0 +1,126 @@
+/* eslint-env mocha */
+'use strict'
+
+const hat = require('hat')
+const { getDescribe, getIt, expect } = require('../utils/mocha')
+const delay = require('delay')
+
+module.exports = (common, options) => {
+  const describe = getDescribe(options)
+  const it = getIt(options)
+
+  describe('.files.touch', function () {
+    this.timeout(10 * 1000)
+
+    let ipfs
+
+    async function testMtime (mtime, expectedMtime) {
+      const testPath = `/test-${hat()}`
+
+      await ipfs.files.write(testPath, Buffer.from('Hello, world!'), {
+        create: true
+      })
+
+      const stat = await ipfs.files.stat(testPath)
+      expect(stat).to.not.have.deep.property('mtime', expectedMtime)
+
+      await ipfs.files.touch(testPath, {
+        mtime
+      })
+
+      const stat2 = await ipfs.files.stat(testPath)
+      expect(stat2).to.have.nested.deep.property('mtime', expectedMtime)
+    }
+
+    before(async () => { ipfs = (await common.spawn()).api })
+
+    after(() => common.clean())
+
+    it('should have default mtime', async function () {
+      this.slow(5 * 1000)
+      const testPath = `/test-${hat()}`
+
+      await ipfs.files.write(testPath, Buffer.from('Hello, world!'), {
+        create: true
+      })
+
+      const stat = await ipfs.files.stat(testPath)
+      expect(stat).to.not.have.property('mtime')
+
+      await ipfs.files.touch(testPath)
+
+      const stat2 = await ipfs.files.stat(testPath)
+      expect(stat2).to.have.property('mtime').that.does.not.deep.equal({
+        secs: 0,
+        nsecs: 0
+      })
+    })
+
+    it('should update file mtime', async function () {
+      this.slow(5 * 1000)
+      const testPath = `/test-${hat()}`
+      const mtime = new Date()
+      const seconds = Math.floor(mtime.getTime() / 1000)
+
+      await ipfs.files.write(testPath, Buffer.from('Hello, world!'), {
+        create: true,
+        mtime
+      })
+      await delay(2000)
+      await ipfs.files.touch(testPath)
+
+      const stat = await ipfs.files.stat(testPath)
+      expect(stat).to.have.nested.property('mtime.secs').that.is.greaterThan(seconds)
+    })
+
+    it('should update directory mtime', async function () {
+      this.slow(5 * 1000)
+      const testPath = `/test-${hat()}`
+      const mtime = new Date()
+      const seconds = Math.floor(mtime.getTime() / 1000)
+
+      await ipfs.files.mkdir(testPath, {
+        create: true,
+        mtime
+      })
+      await delay(2000)
+      await ipfs.files.touch(testPath)
+
+      const stat2 = await ipfs.files.stat(testPath)
+      expect(stat2).to.have.nested.property('mtime.secs').that.is.greaterThan(seconds)
+    })
+
+    it('should set mtime as Date', async function () {
+      await testMtime(new Date(5000), {
+        secs: 5,
+        nsecs: 0
+      })
+    })
+
+    it('should set mtime as { nsecs, secs }', async function () {
+      const mtime = {
+        secs: 5,
+        nsecs: 0
+      }
+      await testMtime(mtime, mtime)
+    })
+
+    it('should set mtime as timespec', async function () {
+      await testMtime({
+        Seconds: 5,
+        FractionalNanoseconds: 0
+      }, {
+        secs: 5,
+        nsecs: 0
+      })
+    })
+
+    it('should set mtime as hrtime', async function () {
+      const mtime = process.hrtime()
+      await testMtime(mtime, {
+        secs: mtime[0],
+        nsecs: mtime[1]
+      })
+    })
+  })
+}
diff --git a/src/files-mfs/write.js b/src/files-mfs/write.js
index 0fb3a72e..5125fe2a 100644
--- a/src/files-mfs/write.js
+++ b/src/files-mfs/write.js
@@ -18,6 +18,32 @@ module.exports = (common, options) => {
 
     let ipfs
 
+    async function testMode (mode, expectedMode) {
+      const testPath = `/test-${hat()}`
+
+      await ipfs.files.write(testPath, Buffer.from('Hello, world!'), {
+        create: true,
+        parents: true,
+        mode
+      })
+
+      const stats = await ipfs.files.stat(testPath)
+      expect(stats).to.have.property('mode', expectedMode)
+    }
+
+    async function testMtime (mtime, expectedMtime) {
+      const testPath = `/test-${hat()}`
+
+      await ipfs.files.write(testPath, Buffer.from('Hello, world!'), {
+        create: true,
+        parents: true,
+        mtime
+      })
+
+      const stats = await ipfs.files.stat(testPath)
+      expect(stats).to.have.deep.property('mtime', expectedMtime)
+    }
+
     before(async () => { ipfs = (await common.spawn()).api })
 
     after(() => common.clean())
@@ -45,5 +71,51 @@ module.exports = (common, options) => {
       const stats = await ipfs.files.stat(testPath)
       expect(stats.type).to.equal('file')
     })
+
+    it('should write file and specify mode as a string', async function () {
+      const mode = '0321'
+      await testMode(mode, parseInt(mode, 8))
+    })
+
+    it('should write file and specify mode as a number', async function () {
+      const mode = parseInt('0321', 8)
+      await testMode(mode, mode)
+    })
+
+    it('should write file and specify mtime as Date', async function () {
+      const mtime = new Date()
+      const seconds = Math.floor(mtime.getTime() / 1000)
+      const expectedMtime = {
+        secs: seconds,
+        nsecs: (mtime.getTime() - (seconds * 1000)) * 1000
+      }
+      await testMtime(mtime, expectedMtime)
+    })
+
+    it('should write file and specify mtime as { nsecs, secs }', async function () {
+      const mtime = {
+        secs: 5,
+        nsecs: 0
+      }
+      await testMtime(mtime, mtime)
+    })
+
+    it('should write file and specify mtime as timespec', async function () {
+      await testMtime({
+        Seconds: 5,
+        FractionalNanoseconds: 0
+      }, {
+        secs: 5,
+        nsecs: 0
+      })
+    })
+
+    it('should write file and specify mtime as hrtime', async function () {
+      const mtime = process.hrtime()
+      await testMtime(mtime, {
+        secs: mtime[0],
+        nsecs: mtime[1]
+      })
+    })
   })
 }
diff --git a/src/files-regular/add-from-fs.js b/src/files-regular/add-from-fs.js
index a20a0171..db8a1bd2 100644
--- a/src/files-regular/add-from-fs.js
+++ b/src/files-regular/add-from-fs.js
@@ -44,7 +44,8 @@ module.exports = (common, options) => {
       const filesPath = path.join(fixturesPath, 'test-folder')
 
       const result = await ipfs.addFromFs(filesPath, { recursive: true, ignore: ['files/**'] })
-      expect(result.length).to.be.below(9)
+
+      expect(result.some(file => file.path.includes('test-folder/files/'))).to.be.false()
     })
 
     it('should add a file from the file system', async () => {
diff --git a/src/files-regular/add.js b/src/files-regular/add.js
index c1fbaaa7..4a51c9a4 100644
--- a/src/files-regular/add.js
+++ b/src/files-regular/add.js
@@ -22,6 +22,30 @@ module.exports = (common, options) => {
 
     let ipfs
 
+    async function testMode (mode, expectedMode) {
+      const content = String(Math.random() + Date.now())
+      const files = await ipfs.add({
+        content: Buffer.from(content),
+        mode
+      })
+      expect(files).to.have.length(1)
+
+      const stats = await ipfs.files.stat(`/ipfs/${files[0].hash}`)
+      expect(stats).to.have.property('mode', expectedMode)
+    }
+
+    async function testMtime (mtime, expectedMtime) {
+      const content = String(Math.random() + Date.now())
+      const files = await ipfs.add({
+        content: Buffer.from(content),
+        mtime
+      })
+      expect(files).to.have.length(1)
+
+      const stats = await ipfs.files.stat(`/ipfs/${files[0].hash}`)
+      expect(stats).to.have.deep.property('mtime', expectedMtime)
+    }
+
     before(async () => { ipfs = (await common.spawn()).api })
 
     after(() => common.clean())
@@ -299,5 +323,55 @@ module.exports = (common, options) => {
 
       await expectTimeout(ipfs.object.get(files[0].hash), 4000)
     })
+
+    it('should add with mode as string', async function () {
+      this.slow(10 * 1000)
+      const mode = '0777'
+      await testMode(mode, parseInt(mode, 8))
+    })
+
+    it('should add with mode as number', async function () {
+      this.slow(10 * 1000)
+      const mode = parseInt('0777', 8)
+      await testMode(mode, mode)
+    })
+
+    it('should add with mtime as Date', async function () {
+      this.slow(10 * 1000)
+      const mtime = new Date(5000)
+      await testMtime(mtime, {
+        secs: 5,
+        nsecs: 0
+      })
+    })
+
+    it('should add with mtime as { nsecs, secs }', async function () {
+      this.slow(10 * 1000)
+      const mtime = {
+        secs: 5,
+        nsecs: 0
+      }
+      await testMtime(mtime, mtime)
+    })
+
+    it('should add with mtime as timespec', async function () {
+      this.slow(10 * 1000)
+      await testMtime({
+        Seconds: 5,
+        FractionalNanoseconds: 0
+      }, {
+        secs: 5,
+        nsecs: 0
+      })
+    })
+
+    it('should add with mtime as hrtime', async function () {
+      this.slow(10 * 1000)
+      const mtime = process.hrtime()
+      await testMtime(mtime, {
+        secs: mtime[0],
+        nsecs: mtime[1]
+      })
+    })
   })
 }
diff --git a/src/files-regular/ls-pull-stream.js b/src/files-regular/ls-pull-stream.js
index 699574fa..04f43e39 100644
--- a/src/files-regular/ls-pull-stream.js
+++ b/src/files-regular/ls-pull-stream.js
@@ -53,57 +53,48 @@ module.exports = (common, options) => {
       const cid = 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP'
       const stream = ipfs.lsPullStream(cid)
 
-      const files = await pullToPromise.any(stream)
-      expect(files).to.eql([
-        {
-          depth: 1,
-          name: 'alice.txt',
-          path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/alice.txt',
-          size: 11685,
-          hash: 'QmZyUEQVuRK3XV7L9Dk26pg6RVSgaYkiSTEdnT2kZZdwoi',
-          type: 'file'
-        },
-        {
-          depth: 1,
-          name: 'empty-folder',
-          path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/empty-folder',
-          size: 0,
-          hash: 'QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn',
-          type: 'dir'
-        },
-        {
-          depth: 1,
-          name: 'files',
-          path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/files',
-          size: 0,
-          hash: 'QmZ25UfTqXGz9RsEJFg7HUAuBcmfx5dQZDXQd2QEZ8Kj74',
-          type: 'dir'
-        },
-        {
-          depth: 1,
-          name: 'holmes.txt',
-          path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/holmes.txt',
-          size: 581878,
-          hash: 'QmR4nFjTu18TyANgC65ArNWp5Yaab1gPzQ4D8zp7Kx3vhr',
-          type: 'file'
-        },
-        {
-          depth: 1,
-          name: 'jungle.txt',
-          path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/jungle.txt',
-          size: 2294,
-          hash: 'QmT6orWioMiSqXXPGsUi71CKRRUmJ8YkuueV2DPV34E9y9',
-          type: 'file'
-        },
-        {
-          depth: 1,
-          name: 'pp.txt',
-          path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/pp.txt',
-          size: 4540,
-          hash: 'QmVwdDCY4SPGVFnNCiZnX5CtzwWDn6kAM98JXzKxE3kCmn',
-          type: 'file'
-        }
-      ])
+      const output = await pullToPromise.any(stream)
+      expect(output).to.have.lengthOf(6)
+      expect(output).to.have.nested.property('[0].depth', 1)
+      expect(output).to.have.nested.property('[0].name', 'alice.txt')
+      expect(output).to.have.nested.property('[0].path', 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/alice.txt')
+      expect(output).to.have.nested.property('[0].size', 11685)
+      expect(output).to.have.nested.property('[0].type', 'file')
+
+      expect(output).to.have.nested.property('[1].depth', 1)
+      expect(output).to.have.nested.property('[1].name', 'empty-folder')
+      expect(output).to.have.nested.property('[1].path', 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/empty-folder')
+      expect(output).to.have.nested.property('[1].size', 0)
+      expect(output).to.have.nested.property('[1].hash', 'QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn')
+      expect(output).to.have.nested.property('[1].type', 'dir')
+
+      expect(output).to.have.nested.property('[2].depth', 1)
+      expect(output).to.have.nested.property('[2].name', 'files')
+      expect(output).to.have.nested.property('[2].path', 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/files')
+      expect(output).to.have.nested.property('[2].size', 0)
+      expect(output).to.have.nested.property('[2].hash', 'QmZ25UfTqXGz9RsEJFg7HUAuBcmfx5dQZDXQd2QEZ8Kj74')
+      expect(output).to.have.nested.property('[2].type', 'dir')
+
+      expect(output).to.have.nested.property('[3].depth', 1)
+      expect(output).to.have.nested.property('[3].name', 'holmes.txt')
+      expect(output).to.have.nested.property('[3].path', 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/holmes.txt')
+      expect(output).to.have.nested.property('[3].size', 581878)
+      expect(output).to.have.nested.property('[3].hash', 'QmR4nFjTu18TyANgC65ArNWp5Yaab1gPzQ4D8zp7Kx3vhr')
+      expect(output).to.have.nested.property('[3].type', 'file')
+
+      expect(output).to.have.nested.property('[4].depth', 1)
+      expect(output).to.have.nested.property('[4].name', 'jungle.txt')
+      expect(output).to.have.nested.property('[4].path', 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/jungle.txt')
+      expect(output).to.have.nested.property('[4].size', 2294)
+      expect(output).to.have.nested.property('[4].hash', 'QmT6orWioMiSqXXPGsUi71CKRRUmJ8YkuueV2DPV34E9y9')
+      expect(output).to.have.nested.property('[4].type', 'file')
+
+      expect(output).to.have.nested.property('[5].depth', 1)
+      expect(output).to.have.nested.property('[5].name', 'pp.txt')
+      expect(output).to.have.nested.property('[5].path', 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/pp.txt')
+      expect(output).to.have.nested.property('[5].size', 4540)
+      expect(output).to.have.nested.property('[5].hash', 'QmVwdDCY4SPGVFnNCiZnX5CtzwWDn6kAM98JXzKxE3kCmn')
+      expect(output).to.have.nested.property('[5].type', 'file')
     })
   })
 }
diff --git a/src/files-regular/ls-readable-stream.js b/src/files-regular/ls-readable-stream.js
index 42e39fe0..37dc3d00 100644
--- a/src/files-regular/ls-readable-stream.js
+++ b/src/files-regular/ls-readable-stream.js
@@ -53,57 +53,48 @@ module.exports = (common, options) => {
       const cid = 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP'
       const stream = ipfs.lsReadableStream(cid)
 
-      const files = await getStream.array(stream)
-      expect(files).to.eql([
-        {
-          depth: 1,
-          name: 'alice.txt',
-          path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/alice.txt',
-          size: 11685,
-          hash: 'QmZyUEQVuRK3XV7L9Dk26pg6RVSgaYkiSTEdnT2kZZdwoi',
-          type: 'file'
-        },
-        {
-          depth: 1,
-          name: 'empty-folder',
-          path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/empty-folder',
-          size: 0,
-          hash: 'QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn',
-          type: 'dir'
-        },
-        {
-          depth: 1,
-          name: 'files',
-          path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/files',
-          size: 0,
-          hash: 'QmZ25UfTqXGz9RsEJFg7HUAuBcmfx5dQZDXQd2QEZ8Kj74',
-          type: 'dir'
-        },
-        {
-          depth: 1,
-          name: 'holmes.txt',
-          path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/holmes.txt',
-          size: 581878,
-          hash: 'QmR4nFjTu18TyANgC65ArNWp5Yaab1gPzQ4D8zp7Kx3vhr',
-          type: 'file'
-        },
-        {
-          depth: 1,
-          name: 'jungle.txt',
-          path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/jungle.txt',
-          size: 2294,
-          hash: 'QmT6orWioMiSqXXPGsUi71CKRRUmJ8YkuueV2DPV34E9y9',
-          type: 'file'
-        },
-        {
-          depth: 1,
-          name: 'pp.txt',
-          path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/pp.txt',
-          size: 4540,
-          hash: 'QmVwdDCY4SPGVFnNCiZnX5CtzwWDn6kAM98JXzKxE3kCmn',
-          type: 'file'
-        }
-      ])
+      const output = await getStream.array(stream)
+      expect(output).to.have.lengthOf(6)
+      expect(output).to.have.nested.property('[0].depth', 1)
+      expect(output).to.have.nested.property('[0].name', 'alice.txt')
+      expect(output).to.have.nested.property('[0].path', 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/alice.txt')
+      expect(output).to.have.nested.property('[0].size', 11685)
+      expect(output).to.have.nested.property('[0].type', 'file')
+
+      expect(output).to.have.nested.property('[1].depth', 1)
+      expect(output).to.have.nested.property('[1].name', 'empty-folder')
+      expect(output).to.have.nested.property('[1].path', 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/empty-folder')
+      expect(output).to.have.nested.property('[1].size', 0)
+      expect(output).to.have.nested.property('[1].hash', 'QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn')
+      expect(output).to.have.nested.property('[1].type', 'dir')
+
+      expect(output).to.have.nested.property('[2].depth', 1)
+      expect(output).to.have.nested.property('[2].name', 'files')
+      expect(output).to.have.nested.property('[2].path', 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/files')
+      expect(output).to.have.nested.property('[2].size', 0)
+      expect(output).to.have.nested.property('[2].hash', 'QmZ25UfTqXGz9RsEJFg7HUAuBcmfx5dQZDXQd2QEZ8Kj74')
+      expect(output).to.have.nested.property('[2].type', 'dir')
+
+      expect(output).to.have.nested.property('[3].depth', 1)
+      expect(output).to.have.nested.property('[3].name', 'holmes.txt')
+      expect(output).to.have.nested.property('[3].path', 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/holmes.txt')
+      expect(output).to.have.nested.property('[3].size', 581878)
+      expect(output).to.have.nested.property('[3].hash', 'QmR4nFjTu18TyANgC65ArNWp5Yaab1gPzQ4D8zp7Kx3vhr')
+      expect(output).to.have.nested.property('[3].type', 'file')
+
+      expect(output).to.have.nested.property('[4].depth', 1)
+      expect(output).to.have.nested.property('[4].name', 'jungle.txt')
+      expect(output).to.have.nested.property('[4].path', 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/jungle.txt')
+      expect(output).to.have.nested.property('[4].size', 2294)
+      expect(output).to.have.nested.property('[4].hash', 'QmT6orWioMiSqXXPGsUi71CKRRUmJ8YkuueV2DPV34E9y9')
+      expect(output).to.have.nested.property('[4].type', 'file')
+
+      expect(output).to.have.nested.property('[5].depth', 1)
+      expect(output).to.have.nested.property('[5].name', 'pp.txt')
+      expect(output).to.have.nested.property('[5].path', 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/pp.txt')
+      expect(output).to.have.nested.property('[5].size', 4540)
+      expect(output).to.have.nested.property('[5].hash', 'QmVwdDCY4SPGVFnNCiZnX5CtzwWDn6kAM98JXzKxE3kCmn')
+      expect(output).to.have.nested.property('[5].type', 'file')
     })
   })
 }
diff --git a/src/files-regular/ls.js b/src/files-regular/ls.js
index 4c365487..a3d127d6 100644
--- a/src/files-regular/ls.js
+++ b/src/files-regular/ls.js
@@ -53,58 +53,49 @@ module.exports = (common, options) => {
       expect(root.hash).to.equal(fixtures.directory.cid)
 
       const cid = 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP'
-      const files = await ipfs.ls(cid)
-
-      expect(files).to.eql([
-        {
-          depth: 1,
-          name: 'alice.txt',
-          path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/alice.txt',
-          size: 11685,
-          hash: 'QmZyUEQVuRK3XV7L9Dk26pg6RVSgaYkiSTEdnT2kZZdwoi',
-          type: 'file'
-        },
-        {
-          depth: 1,
-          name: 'empty-folder',
-          path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/empty-folder',
-          size: 0,
-          hash: 'QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn',
-          type: 'dir'
-        },
-        {
-          depth: 1,
-          name: 'files',
-          path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/files',
-          size: 0,
-          hash: 'QmZ25UfTqXGz9RsEJFg7HUAuBcmfx5dQZDXQd2QEZ8Kj74',
-          type: 'dir'
-        },
-        {
-          depth: 1,
-          name: 'holmes.txt',
-          path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/holmes.txt',
-          size: 581878,
-          hash: 'QmR4nFjTu18TyANgC65ArNWp5Yaab1gPzQ4D8zp7Kx3vhr',
-          type: 'file'
-        },
-        {
-          depth: 1,
-          name: 'jungle.txt',
-          path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/jungle.txt',
-          size: 2294,
-          hash: 'QmT6orWioMiSqXXPGsUi71CKRRUmJ8YkuueV2DPV34E9y9',
-          type: 'file'
-        },
-        {
-          depth: 1,
-          name: 'pp.txt',
-          path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/pp.txt',
-          size: 4540,
-          hash: 'QmVwdDCY4SPGVFnNCiZnX5CtzwWDn6kAM98JXzKxE3kCmn',
-          type: 'file'
-        }
-      ])
+      const output = await ipfs.ls(cid)
+
+      expect(output).to.have.lengthOf(6)
+      expect(output).to.have.nested.property('[0].depth', 1)
+      expect(output).to.have.nested.property('[0].name', 'alice.txt')
+      expect(output).to.have.nested.property('[0].path', 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/alice.txt')
+      expect(output).to.have.nested.property('[0].size', 11685)
+      expect(output).to.have.nested.property('[0].type', 'file')
+
+      expect(output).to.have.nested.property('[1].depth', 1)
+      expect(output).to.have.nested.property('[1].name', 'empty-folder')
+      expect(output).to.have.nested.property('[1].path', 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/empty-folder')
+      expect(output).to.have.nested.property('[1].size', 0)
+      expect(output).to.have.nested.property('[1].hash', 'QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn')
+      expect(output).to.have.nested.property('[1].type', 'dir')
+
+      expect(output).to.have.nested.property('[2].depth', 1)
+      expect(output).to.have.nested.property('[2].name', 'files')
+      expect(output).to.have.nested.property('[2].path', 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/files')
+      expect(output).to.have.nested.property('[2].size', 0)
+      expect(output).to.have.nested.property('[2].hash', 'QmZ25UfTqXGz9RsEJFg7HUAuBcmfx5dQZDXQd2QEZ8Kj74')
+      expect(output).to.have.nested.property('[2].type', 'dir')
+
+      expect(output).to.have.nested.property('[3].depth', 1)
+      expect(output).to.have.nested.property('[3].name', 'holmes.txt')
+      expect(output).to.have.nested.property('[3].path', 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/holmes.txt')
+      expect(output).to.have.nested.property('[3].size', 581878)
+      expect(output).to.have.nested.property('[3].hash', 'QmR4nFjTu18TyANgC65ArNWp5Yaab1gPzQ4D8zp7Kx3vhr')
+      expect(output).to.have.nested.property('[3].type', 'file')
+
+      expect(output).to.have.nested.property('[4].depth', 1)
+      expect(output).to.have.nested.property('[4].name', 'jungle.txt')
+      expect(output).to.have.nested.property('[4].path', 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/jungle.txt')
+      expect(output).to.have.nested.property('[4].size', 2294)
+      expect(output).to.have.nested.property('[4].hash', 'QmT6orWioMiSqXXPGsUi71CKRRUmJ8YkuueV2DPV34E9y9')
+      expect(output).to.have.nested.property('[4].type', 'file')
+
+      expect(output).to.have.nested.property('[5].depth', 1)
+      expect(output).to.have.nested.property('[5].name', 'pp.txt')
+      expect(output).to.have.nested.property('[5].path', 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/pp.txt')
+      expect(output).to.have.nested.property('[5].size', 4540)
+      expect(output).to.have.nested.property('[5].hash', 'QmVwdDCY4SPGVFnNCiZnX5CtzwWDn6kAM98JXzKxE3kCmn')
+      expect(output).to.have.nested.property('[5].type', 'file')
     })
 
     it('should ls files added as CIDv0 with a CIDv1', async () => {
@@ -177,5 +168,30 @@ module.exports = (common, options) => {
         expect(res.find(file => file.hash === hash)).to.exist()
       })
     })
+
+    it('should ls with metadata', async () => {
+      const dir = randomName('DIR')
+      const mtime = new Date()
+      const mode = '0532'
+      const expectedMode = parseInt(mode, 8)
+      const expectedMtime = {
+        secs: Math.floor(mtime.getTime() / 1000),
+        nsecs: (mtime.getTime() - (Math.floor(mtime.getTime() / 1000) * 1000)) * 1000
+      }
+
+      const input = [
+        { path: `${dir}/${randomName('F0')}`, content: Buffer.from(randomName('D0')), mode, mtime },
+        { path: `${dir}/${randomName('F1')}`, content: Buffer.from(randomName('D1')), mode, mtime }
+      ]
+
+      const res = await ipfs.add(input)
+      const output = await ipfs.ls(`/ipfs/${res[res.length - 1].hash}`)
+
+      expect(output).to.have.lengthOf(input.length)
+      expect(output).to.have.nested.deep.property('[0].mtime', expectedMtime)
+      expect(output).to.have.nested.property('[0].mode', expectedMode)
+      expect(output).to.have.nested.deep.property('[1].mtime', expectedMtime)
+      expect(output).to.have.nested.property('[1].mode', expectedMode)
+    })
   })
 }