enhanced client class