Add :want-stream option support