support new conditionals and error messages