Added support for timeout argment