Starting idmap support

Change-Id: I84c603fed925ea7349f1de9a40b56dbf9f3e3ceb