Abstracted Id / design Issue fix

Abstracted Id