WS/API improvements