Refactoring client