Ws integration

PR for comments