Start global client refactoring
Complete global client refactoring