Getting rid of ExpressionFactory