Changes :
Refactoring variable provider, for expression evaluation.
Backup commit