Use more out arguments, replace some more User and Stream methods