New parsing regex to support per message