Updating to streams-M2