Switching to streams 2 API