Refactor key streaming and start on outputs