updated StreamServer implementation