code reorganization and some more info in WS response.