admin client refactoring