work on WS API polish