Merged the webservice manager project in