Changing the identity info API in order to restore buildability