Refactor/support string formulas