client manager refactoring