ExpressionDecorator improved
Update refactored