Update of expressions implementation.

And and Or isn't already done