Refactoring SovndClient