Updated identity map implementation