Full stream API rehaul