Improve Expression Evaluator

Extend expression with symoble and locator types