Refactor into MultiUserClient