[0.0.25m] Few WS.Base updates