diff --git a/src/mappings/erc20Templates.ts b/src/mappings/erc20Templates.ts
index 869d20a..28b821e 100644
--- a/src/mappings/erc20Templates.ts
+++ b/src/mappings/erc20Templates.ts
@@ -29,7 +29,7 @@ export function handleOrderStarted(event: OrderStarted): void {
   )
 
   const token = getToken(event.address.toHex())
-  order.token = token.id
+  order.datatoken = token.id
   token.orderCount = token.orderCount.plus(integer.ONE)
 
   const consumer = getUser(event.params.consumer.toHex())
@@ -43,7 +43,7 @@ export function handleOrderStarted(event: OrderStarted): void {
     token.decimals
   )
 
-  order.serviceId = event.params.serviceIndex.toI32()
+  order.serviceIndex = event.params.serviceIndex.toI32()
 
   const publishMarket = getUser(event.params.publishMarketAddress.toHex())
   order.publishingMarket = publishMarket.id
diff --git a/src/mappings/nftUpdate.ts b/src/mappings/nftUpdate.ts
index 3043f35..3ac2aed 100644
--- a/src/mappings/nftUpdate.ts
+++ b/src/mappings/nftUpdate.ts
@@ -1,4 +1,3 @@
-import { log } from '@graphprotocol/graph-ts'
 import { Nft, NftUpdate } from '../@types/schema'
 import {
   MetadataCreated,