webserviceproxy refactor