Adaption of parsers to new stream module