Add alternative and combined stop conditions