Update: Further measures undertaken to address Stream performance