Update Client implementation