More client class refactoring