#42 refactoring S2S.Client