switch to non-experimental identity API