Added support for formulae