Client Model changes