diff --git a/schema.graphql b/schema.graphql
index 5946cdf..6c6421e 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -100,8 +100,9 @@ type Upgrade @entity {
   # End – default data block
 
   impl: Bytes
-  version: String
-  type: String
+  version: String!
+  creatorContractImpl: Bytes
+  type: String!
 }
 
 type EditionMetadata @entity {
diff --git a/src/ERC1155Mappings/factoryMappings.ts b/src/ERC1155Mappings/factoryMappings.ts
index 02b04ce..b3b654c 100644
--- a/src/ERC1155Mappings/factoryMappings.ts
+++ b/src/ERC1155Mappings/factoryMappings.ts
@@ -113,9 +113,9 @@ export function handle1155FactoryUpgraded(event: Upgraded): void {
   upgrade.block = event.block.number;
   upgrade.timestamp = event.block.timestamp;
   upgrade.impl = event.params.implementation;
-  upgrade.version = creator.contractVersion()
+  upgrade.version = creator.contractVersion();
+  upgrade.creatorContractImpl = creator.try_zora1155Impl().value;
   upgrade.address = event.address;
-  upgrade.type = "1155Factory";
 
   // Save required factories.
   factory.txn = txn;
diff --git a/src/ERC721Mappings/ERC721FactoryMappings.ts b/src/ERC721Mappings/ERC721FactoryMappings.ts
index 216bf60..a6790ac 100644
--- a/src/ERC721Mappings/ERC721FactoryMappings.ts
+++ b/src/ERC721Mappings/ERC721FactoryMappings.ts
@@ -86,6 +86,8 @@ export function handleFactoryUpgraded(event: Upgraded): void {
   upgrade.block = event.block.number;
   upgrade.timestamp = event.block.timestamp;
   upgrade.impl = event.params.implementation;
+  upgrade.version = creator.contractVersion().toString();
+  upgrade.creatorContractImpl = creator.implementation();
   upgrade.address = event.address;
   upgrade.type = "721Factory";