diff --git a/utils/whoisData.py b/utils/whoisData.py
index adf46a6..c714151 100644
--- a/utils/whoisData.py
+++ b/utils/whoisData.py
@@ -3,6 +3,7 @@ import whois
 
 class WhoIS():
     def __init__(self, domain):
+        self.domain = domain
         self.getWhois(domain)
 
     def getWhois(self, domain):
@@ -10,5 +11,12 @@ class WhoIS():
         whoisData = whois.parser.Parser(domain, whoisData[1]).parse()
         self.registrar = whoisData.get('Registrar')
         self.status = whoisData.get('Status')
-        self.registrant = whoisData.get('RegistrantName')
+        self.registrant = self.buildRegistrantInfo(whoisData)
         self.nameservers = whoisData.get('NameServer')
+
+    def buildRegistrantInfo(self, whoisData):
+        ret = {}
+        ret['registrantName'] = whoisData.get('RegistrantName')
+        ret['eligibilityType'] = whoisData.get('EligibilityType')
+        ret['registrantID'] = whoisData.get('RegistrantID')
+        return ret