[] Update Client

Update Client and related classes