+ Changes due to modularization of WO