Rework client.Interface