Add support for timeouts