Adding metadata
Fixing node id