Add support for onClientTimeout