Added comment to stream handlers