Add support for start/stop timeouts