Rework how rep addresses are provided to the client