Edit Client to use some new interface