ExpressionFactory - functions added