Converting to new stream-spigot interface