#398 Work on WS support for RESTful API