Vinay | #817 | Add metadata for id generation