Added support for INVAR formulas