client class renamed and added some doc