added streams, their types might be wrong tho