A lot of changes. UserId is now string