Hotfix/identity reference

Hotfix/identity reference