Added stream flexibility.