Add fetch-stream-start, fetch-stream-end and lots of tokens