First phase of client refactorings
Second phase of client refactorings
Last phase of client refactorings