Client refactored.