diff --git a/PiwigoDotnet/Piwigo.Client/IGroupApi.cs b/PiwigoDotnet/Piwigo.Client/IGroupApi.cs
new file mode 100644
index 0000000..fadd426
--- /dev/null
+++ b/PiwigoDotnet/Piwigo.Client/IGroupApi.cs
@@ -0,0 +1,3 @@
+namespace Piwigo.Client;
+
+public interface IGroupApi {}
\ No newline at end of file
diff --git a/PiwigoDotnet/Piwigo.Client/IImageApi.cs b/PiwigoDotnet/Piwigo.Client/IImageApi.cs
new file mode 100644
index 0000000..9ba4ce2
--- /dev/null
+++ b/PiwigoDotnet/Piwigo.Client/IImageApi.cs
@@ -0,0 +1,3 @@
+namespace Piwigo.Client;
+
+public interface IImageApi {}
\ No newline at end of file
diff --git a/PiwigoDotnet/Piwigo.Client/IPermissionApi.cs b/PiwigoDotnet/Piwigo.Client/IPermissionApi.cs
new file mode 100644
index 0000000..acc3ae8
--- /dev/null
+++ b/PiwigoDotnet/Piwigo.Client/IPermissionApi.cs
@@ -0,0 +1,3 @@
+namespace Piwigo.Client;
+
+public interface IPermissionApi {}
\ No newline at end of file
diff --git a/PiwigoDotnet/Piwigo.Client/IPiwigoClient.cs b/PiwigoDotnet/Piwigo.Client/IPiwigoClient.cs
index d6c47f3..a1e6176 100644
--- a/PiwigoDotnet/Piwigo.Client/IPiwigoClient.cs
+++ b/PiwigoDotnet/Piwigo.Client/IPiwigoClient.cs
@@ -2,6 +2,11 @@
 
 public interface IPiwigoClient
 {
+    IGroupApi Group { get; }
+    IImageApi Image { get; }
+    IPermissionApi Permission { get; }
+    ITagApi Tag { get; }
+    IUserApi User { get; }
     ISessionApi Session { get; }
     ICategoryApi Category { get; }
 }
\ No newline at end of file
diff --git a/PiwigoDotnet/Piwigo.Client/ITagApi.cs b/PiwigoDotnet/Piwigo.Client/ITagApi.cs
new file mode 100644
index 0000000..373c280
--- /dev/null
+++ b/PiwigoDotnet/Piwigo.Client/ITagApi.cs
@@ -0,0 +1,3 @@
+namespace Piwigo.Client;
+
+public interface ITagApi {}
\ No newline at end of file
diff --git a/PiwigoDotnet/Piwigo.Client/IUserApi.cs b/PiwigoDotnet/Piwigo.Client/IUserApi.cs
new file mode 100644
index 0000000..f7cf15e
--- /dev/null
+++ b/PiwigoDotnet/Piwigo.Client/IUserApi.cs
@@ -0,0 +1,3 @@
+namespace Piwigo.Client;
+
+public interface IUserApi {}
\ No newline at end of file
diff --git a/PiwigoDotnet/Piwigo.Client/PiwigoClient.cs b/PiwigoDotnet/Piwigo.Client/PiwigoClient.cs
index 279abd4..acea905 100644
--- a/PiwigoDotnet/Piwigo.Client/PiwigoClient.cs
+++ b/PiwigoDotnet/Piwigo.Client/PiwigoClient.cs
@@ -2,12 +2,22 @@ namespace Piwigo.Client;
 
 public class PiwigoClient : IPiwigoClient
 {
-    public PiwigoClient(ISessionApi session, ICategoryApi category)
+    public PiwigoClient(IGroupApi group, IImageApi image, IPermissionApi permission, ITagApi tag, IUserApi user, ISessionApi session, ICategoryApi category)
     {
-        Session = session;
-        Category = category;
+        Group = group ?? throw new ArgumentNullException(nameof(group));
+        Image = image ?? throw new ArgumentNullException(nameof(image));
+        Permission = permission ?? throw new ArgumentNullException(nameof(permission));
+        Tag = tag ?? throw new ArgumentNullException(nameof(tag));
+        User = user ?? throw new ArgumentNullException(nameof(user));
+        Session = session ?? throw new ArgumentNullException(nameof(session));
+        Category = category ?? throw new ArgumentNullException(nameof(category));
     }
 
+    public IGroupApi Group { get; }
+    public IImageApi Image { get; }
+    public IPermissionApi Permission { get; }
+    public ITagApi Tag { get; }
+    public IUserApi User { get; }
     public ISessionApi Session { get; }
     public ICategoryApi Category { get; }
 }
\ No newline at end of file