Stream support. Bug fixes. Exclude option.