Refactoring for configuration.
Did the service configuration as well as the WebService client.