Adding multiline support to prevent breakage