diff --git a/whois/tlds/org b/whois/tlds/org
index bee5cd8..caae272 100644
--- a/whois/tlds/org
+++ b/whois/tlds/org
@@ -5,8 +5,50 @@ server = {
 
 parse = {
 	"default": {
-		# "LoadConf": "default/default",
 		"NotFound": "NOT FOUND",
+		"DomainID": "Domain ID:(.+)",
 		"DomainName": "Domain Name:(.+)",
+		"CreationDate": "Created On:(.+)",
+		"ExpirationDate": "Expiration Date:(.+)",
+		"Registrar": "Sponsoring Registrar:(.+)",
+		"Status": "Status:(.+)",
+		"UpdatedDate": "Last Updated On:(.+)",
+		"RegistrantID": "Registrant ID:(.+)",
+		"RegistrantName": "Registrant Name:(.+)",
+		"RegistrantStreet": "Registrant Street\d:(.+)",
+		"RegistrantCity": "Registrant City:(.+)",
+		"RegistrantState/Province": "Registrant State/Province:(.+)",
+		"RegistrantPostralCode": "Registrant Postal Code:(.+)",
+		"RegistrantCountry": "Registrant Country:(.+)",
+		"RegistrantPhone": "Registrant Phone:(.+)",
+		"RegistrantPhoneExt": "Registrant Phone Ext.:(.+)",
+		"RegistrantFAX": "Registrant FAX:(.+)",
+		"RegistrantFAXExt": "Registrant FAX Ext.:(.+)",
+		"RegistrantEmail": "Registrant Email:(.+)",
+		"NameServer": "Name Server:(.+)",		
+		"TechID": "Tech ID:(.+)",
+		"TechName": "Tech Name:(.+)",
+		"TechStreet": "Tech Street\d:(.+)",
+		"TechCity": "Tech City:(.+)",
+		"TechState/Province": "Tech State/Province:(.+)",
+		"TechPostralCode": "Tech Postal Code:(.+)",
+		"TechCountry": "Tech Country:(.+)",
+		"TechPhone": "Tech Phone:(.+)",
+		"TechPhoneExt": "Tech Phone Ext.:(.+)",
+		"TechFAX": "Tech FAX:(.+)",
+		"TechFAXExt": "Tech FAX Ext.:(.+)",
+		"TechEmail": "Tech Email:(.+)",
+		"AdminID": "Admin ID:(.+)",
+		"AdminName": "Admin Name:(.+)",
+		"AdminStreet": "Admin Street\d:(.+)",
+		"AdminCity": "Admin City:(.+)",
+		"AdminState/Province": "Admin State/Province:(.+)",
+		"AdminPostralCode": "Admin Postal Code:(.+)",
+		"AdminCountry": "Admin Country:(.+)",
+		"AdminPhone": "Admin Phone:(.+)",
+		"AdminPhoneExt": "Admin Phone Ext.:(.+)",
+		"AdminFAX": "Admin FAX:(.+)",
+		"AdminFAXExt": "Admin FAX Ext.:(.+)",
+		"AdminEmail": "Admin Email:(.+)",
 	}
 }