removing stream_type, adding addn. accepted types