TBD-562: Improve the way the component's expressions are evaluated