moved additional ws related code to web_services plugin