diff --git a/src/CoreApi/DupsResponse.cs b/src/CoreApi/DupsResponse.cs
new file mode 100644
index 0000000..b983de4
--- /dev/null
+++ b/src/CoreApi/DupsResponse.cs
@@ -0,0 +1,21 @@
+using Ipfs.CoreApi;
+
+namespace Ipfs.Http.CoreApi
+{
+    /// <summary>
+    /// Model holding response from <see cref="FilestoreApi"/> Dups command.
+    /// </summary>
+    public class DupsResponse : IDupsResponse
+    {
+        /// <summary>
+        /// Any error in the <see cref="IFilestoreApi"/> Dups response.
+        /// </summary>
+        public string Err { get; set; }
+
+        /// <summary>
+        /// The error in the <see cref="IFilestoreApi"/> Dups response.
+        /// </summary>
+        public string Ref { get; set; }
+    }
+
+}
diff --git a/src/CoreApi/FilestoreApi.cs b/src/CoreApi/FilestoreApi.cs
new file mode 100644
index 0000000..9476ffe
--- /dev/null
+++ b/src/CoreApi/FilestoreApi.cs
@@ -0,0 +1,50 @@
+using Ipfs.CoreApi;
+using Ipfs.Http.CoreApi;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Ipfs.Http
+{
+    /// <inheritdoc/>
+    public class FilestoreApi : IFilestoreApi
+    {
+        private IpfsClient ipfs;
+
+        /// <inheritdoc/>
+        internal FilestoreApi(IpfsClient ipfs)
+        {
+            this.ipfs = ipfs;
+        }
+
+        /// <inheritdoc/>
+        public async Task<IFilestoreApiObjectResponse> ListAsync(string cid, bool fileOrder, CancellationToken token)
+        {
+            var json = await ipfs.DoCommandAsync("filestore/ls", token, cid, fileOrder.ToString());
+
+            return JsonConvert.DeserializeObject<FilestoreObjectResponse>(json);
+        }
+
+        /// <inheritdoc/>
+        public async Task<IFilestoreApiObjectResponse> VerifyObjectsAsync(string cid, bool fileOrder, CancellationToken token)
+        {
+            var json = await ipfs.DoCommandAsync("filestore/verify", token, cid, fileOrder.ToString());
+
+            return JsonConvert.DeserializeObject<FilestoreObjectResponse>(json);
+        }
+
+        /// <inheritdoc/>
+        public async Task<IDupsResponse> DupsAsync(CancellationToken token)
+        {
+            var json = await ipfs.DoCommandAsync("filestore/dups", token);
+
+            return JsonConvert.DeserializeObject<DupsResponse>(json);
+        }
+    }
+
+}
diff --git a/src/CoreApi/FilestoreKey.cs b/src/CoreApi/FilestoreKey.cs
new file mode 100644
index 0000000..5267294
--- /dev/null
+++ b/src/CoreApi/FilestoreKey.cs
@@ -0,0 +1,18 @@
+using Ipfs.CoreApi;
+using Newtonsoft.Json;
+
+namespace Ipfs.Http
+{
+    /// <summary>
+    /// Model for the hold filestore key
+    /// </summary>
+    public class FilestoreKey : IFilestoreKey
+    {
+        /// <summary>
+        /// Key value.
+        /// </summary>
+        [JsonProperty("/")]
+        public string _ { get; set; }
+    }
+
+}
diff --git a/src/CoreApi/FilestoreObjectResponse.cs b/src/CoreApi/FilestoreObjectResponse.cs
new file mode 100644
index 0000000..4332633
--- /dev/null
+++ b/src/CoreApi/FilestoreObjectResponse.cs
@@ -0,0 +1,41 @@
+using Ipfs.CoreApi;
+
+namespace Ipfs.Http
+{
+    /// <summary>
+    /// Model holding response to <see cref="IFilestoreApi"/>.
+    /// </summary>
+    public class FilestoreObjectResponse : IFilestoreApiObjectResponse
+    {
+        /// <summary>
+        /// Holds any error message.
+        /// </summary>
+        public string ErrorMsg { get; set; }
+
+        /// <summary>
+        /// Path to the file
+        /// </summary>
+        public string FilePath { get; set; }
+
+        /// <summary>
+        /// The key to the Filestore.
+        /// </summary>
+        public FilestoreKey Key { get; set; }
+
+        /// <summary>
+        /// The response offset.
+        /// </summary>
+        public string Offset { get; set; }
+
+        /// <summary>
+        /// The size of the object.
+        /// </summary>
+        public string Size { get; set; }
+
+        /// <summary>
+        /// The object status.k
+        /// </summary>
+        public string Status { get; set; }
+    }
+
+}
diff --git a/src/CoreApi/KeyApi.cs b/src/CoreApi/KeyApi.cs
index a152542..3eae143 100644
--- a/src/CoreApi/KeyApi.cs
+++ b/src/CoreApi/KeyApi.cs
@@ -114,4 +114,4 @@ internal KeyApi(IpfsClient ipfs)
             throw new NotImplementedException();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/IpfsClient.cs b/src/IpfsClient.cs
index 62b1c1c..43d357a 100644
--- a/src/IpfsClient.cs
+++ b/src/IpfsClient.cs
@@ -73,6 +73,7 @@ public IpfsClient()
             Dag = new DagApi(this);
             Object = new ObjectApi(this);
             FileSystem = new FileSystemApi(this);
+            FilestoreApi = new FilestoreApi(this);
             Mfs = new MfsApi(this);
             PubSub = new PubSubApi(this);
             Key = new KeyApi(this);
@@ -163,6 +164,10 @@ public IpfsClient(string host)
         /// <inheritdoc />
         public IFileSystemApi FileSystem { get; private set; }
 
+
+        /// <inheritdoc />
+        public IFilestoreApi FilestoreApi { get; private set; }
+
         /// <inheritdoc />
         public IMfsApi Mfs { get; private set; }