changed from userId to IdentityId