Added support for timeout options