Improve beam stream performance