Adding some goodies for API tokens and streams.