Internal refactor, adding IExpressionNode in some nodes