Improve stream client