diff --git a/src/mappings/nfts/setAttribute.ts b/src/mappings/nfts/setAttribute.ts
index 41ba353..4c343fc 100644
--- a/src/mappings/nfts/setAttribute.ts
+++ b/src/mappings/nfts/setAttribute.ts
@@ -2,9 +2,9 @@ import { getOrFail as get } from '@kodadot1/metasquid/entity'
 import { CollectionEntity, NFTEntity } from '../../model'
 import { unwrap } from '../utils/extract'
 import { Context, isNFT } from '../utils/types'
-// import { addressOf } from '../utils/helper'
+import { addressOf } from '../utils/helper'
 import { getAttributeEvent } from './getters'
-import { tokenIdOf } from './types'
+import { attributeFrom, tokenIdOf } from './types'
 
 export async function handleAttributeSet(context: Context): Promise<void> {
   const event = unwrap(context, getAttributeEvent)
@@ -17,18 +17,18 @@ export async function handleAttributeSet(context: Context): Promise<void> {
     final.attributes = []
   }
 
-  // if ('royalty' in final && event.trait === 'royalty') {
-  //   final.royalty = final.royalty ?? Number.parseFloat(event.value as string)
-  // }
+  if ('royalty' in final && event.trait === 'royalty') {
+    final.royalty = final.royalty ?? Number.parseFloat(event.value as string)
+  }
 
-  // if ('recipient' in final && event.trait === 'recipient') {
-  //   try {
-  //     final.recipient = final.recipient ?? addressOf(event.value as string)
-  //   } catch (error) {
-  //     console.log(error)
-  //     final.recipient = final.recipient ?? (event.value as string)
-  //   }
-  // }
+  if ('recipient' in final && event.trait === 'recipient') {
+    try {
+      final.recipient = final.recipient ?? addressOf(event.value as string)
+    } catch (error) {
+      console.log(error)
+      final.recipient = final.recipient ?? (event.value as string)
+    }
+  }
 
   if (event.value === null) {
     final.attributes = final.attributes?.filter((attr) => attr.trait !== event.trait)
@@ -36,11 +36,10 @@ export async function handleAttributeSet(context: Context): Promise<void> {
     const attribute = final.attributes?.find((attr) => attr.trait === event.trait)
     if (attribute) {
       attribute.value = String(event.value)
-    } 
-    // else if (event.trait !== 'royalty' && event.trait !== 'recipient') {
-    //   const newAttribute = attributeFrom({ trait_type: event.trait, value: String(event.value) })
-    //   final.attributes?.push(newAttribute)
-    // }
+    } else if (event.trait !== 'royalty' && event.trait !== 'recipient') {
+      const newAttribute = attributeFrom({ trait_type: event.trait, value: String(event.value) })
+      final.attributes?.push(newAttribute)
+    }
   }
 
   await context.store.save(final)