Adaptions to the refactorings and extensions in WS, finally working again...