Some refactoring and introduced Webservice objects