Add support for timeout/abort distinction