diff --git a/api.go b/api.go
index 216d1bd..477eebd 100644
--- a/api.go
+++ b/api.go
@@ -118,8 +118,8 @@
 		FROM
 			APP_CREDENTIAL AS c 
 			INNER JOIN APP AS a ON c.app_id = a.id
-			INNER JOIN ALL_DEVELOPERS AS ad 
-				ON (ad.id = a.company_id OR ad.id = a.developer_id)
+			INNER JOIN DEVELOPER AS ad 
+				ON ad.id = a.developer_id
 			INNER JOIN APP_CREDENTIAL_APIPRODUCT_MAPPER as mp 
 				ON mp.appcred_id = c.id 
 			INNER JOIN API_PRODUCT as ap ON ap.id = mp.apiprdt_id
@@ -143,8 +143,8 @@
 		FROM
 			APP_CREDENTIAL AS c
 			INNER JOIN APP AS a ON c.app_id = a.id
-			INNER JOIN ALL_DEVELOPERS AS ad
-				ON (ad.id = a.company_id OR ad.id = a.developer_id)
+			INNER JOIN COMPANY AS ad
+				ON ad.id = a.company_id
 			INNER JOIN APP_CREDENTIAL_APIPRODUCT_MAPPER as mp
 				ON mp.appcred_id = c.id
 			INNER JOIN API_PRODUCT as ap ON ap.id = mp.apiprdt_id
diff --git a/listener.go b/listener.go
index 8ceb9bc..8952775 100644
--- a/listener.go
+++ b/listener.go
@@ -65,6 +65,10 @@
 				ok = insertAPIproducts(payload.Rows, txn)
 			case "kms.app_credential_apiproduct_mapper":
 				ok = insertAPIProductMappers(payload.Rows, txn)
+			case "kms.company":
+				ok = insertCompanies(payload.Rows, txn)
+			case "kms.company_developer":
+				ok = insertCompanyDevelopers(payload.Rows, txn)
 			}
 			if !ok {
 				log.Error("Error encountered in Downloading Snapshot for VerifyApiKey")