Changed to use new identity API