Add identity_uri key as well

Change-Id: Ie96e833db1fa6af6fa4164d8208e20d246147364