Refactoring AdminClient operations