Refactor shares clients