Added identity map implementation