More preperation for User Streams