Modified client class