added ExpressionParser support