diff --git a/files/gvm_library.py b/files/gvm_library.py
index 7d94b8cd99b4963c21bfc27fe073ee0212cdc611..fdbf4846337cca1b8c19f9ad5948ea180ee7904a 100644
--- a/files/gvm_library.py
+++ b/files/gvm_library.py
@@ -49,7 +49,8 @@ class PortList:
     def __str__(self):
         d = {'name': self.name, 
              'id': self.id, 
-             'in_use': self.in_use}
+             'in_use': self.in_use,
+             'client': self.client}
         return pretty_json(d)
     
     def __del__(self):
@@ -94,7 +95,8 @@ class Target:
              'id': self.id, 
              "in_use": self.in_use,
              'hosts': self.hosts,
-             'port_list': self.port_list}
+             'port_list': self.port_list,
+             'client': self.client}
         return pretty_json(d)
     
     def __del__(self):
@@ -155,7 +157,8 @@ class Task:
              'in_use': self.in_use,
              'status': self.status,
              'report_id': self.report_id,
-             'target': self.target}
+             'target': self.target,
+             'client': self.client}
         return pretty_json(d)
     
     def start(self):