Changes on ClientBuffer