some changes in Client module