better handling of addComponent/addStream