Update to be compliant with Weasis 2