Adding support for multiple formulas