Updated for Client changes

Signed-off-by: waterpicker <waterpickerenternity@gmail.com>