Updated WS system plugin