Minor logical functions added from WWPP.