I'd expect UserInfo to just accept an Entities..?