UserId and Type parameters added.