Features/stream opt