(24)webservice refactoring