Refactoring Server