WebService Refactoring