Zoo client refactoring