Some refactoring to soap request class