Changes to FormulaService class