[] Update Client

Update Client and related classes
Merge remote-tracking branch 'origin/UpdateClient'