update on ws-related refactorings