Stylistic changes
ActivateStream now returns token and stream