WIP identity map integration