Add idmap

Change-Id: I749ba2d4c2f92a37e1e95a0d1da497af0be87209