Adapt to dm2e ws refactoring