Updated to integrate expression language for values.