Ws integration

PR for comments
Because it's inherited from another project?