[WS] Did some refactorings
[WS] Changed storage mechanism for dashes