Make UserId be a Long instead of a String
Clean up MapperViews using new UserIds