diff --git a/subgraph/src/ClrFundDeployerMapping.ts b/subgraph/src/ClrFundDeployerMapping.ts
index c04392dac..840ccf8c8 100644
--- a/subgraph/src/ClrFundDeployerMapping.ts
+++ b/subgraph/src/ClrFundDeployerMapping.ts
@@ -5,7 +5,7 @@ import { ClrFundDeployer, ClrFund } from '../generated/schema'
 import { ClrFund as ClrFundTemplate } from '../generated/templates'
 
 export function handleNewInstance(event: NewInstance): void {
-  let clrfundDeployerAddress = event.transaction.to!
+  let clrfundDeployerAddress = event.address
   let clrfundDeployerId = clrfundDeployerAddress.toHex()
 
   let clrFundDeployer = ClrFundDeployer.load(clrfundDeployerId)
diff --git a/subgraph/src/MACIMapping.ts b/subgraph/src/MACIMapping.ts
index 75da4929b..e1cbdb28f 100644
--- a/subgraph/src/MACIMapping.ts
+++ b/subgraph/src/MACIMapping.ts
@@ -21,7 +21,7 @@ import { makePublicKeyId } from './PublicKey'
 // - contract.verifier(...)
 
 export function handleSignUp(event: SignUp): void {
-  let fundingRoundAddress = event.transaction.to!
+  let fundingRoundAddress = event.address
   let fundingRoundId = fundingRoundAddress.toHex()
 
   let publicKeyId = makePublicKeyId(
diff --git a/subgraph/src/PollMapping.ts b/subgraph/src/PollMapping.ts
index 99aa537fb..e3c6fe043 100644
--- a/subgraph/src/PollMapping.ts
+++ b/subgraph/src/PollMapping.ts
@@ -1,19 +1,11 @@
 import { log } from '@graphprotocol/graph-ts'
 import { PublishMessage } from '../generated/templates/Poll/Poll'
 
-import { FundingRound, Poll, Message, PublicKey } from '../generated/schema'
+import { Poll, Message, PublicKey } from '../generated/schema'
 import { makePublicKeyId } from './PublicKey'
 
 export function handlePublishMessage(event: PublishMessage): void {
-  if (!event.transaction.to) {
-    log.error(
-      'Error: handlePublishMessage failed fundingRound not registered',
-      []
-    )
-    return
-  }
-
-  let pollEntityId = event.transaction.to!.toHex()
+  let pollEntityId = event.address.toHex()
   let poll = Poll.load(pollEntityId)
   if (poll == null) {
     log.error('Error: handlePublishMessage failed poll not found {}', [