Move parser method under parse_stream