Changed BasicUser to BasicIdentity