Add addition expressions and fix evaluation

Fixed the evaluation in core to handle strings or trees.