Made some changes to client model