Refactor ZKClient and ZKClientService