Improve Client::execute() method