Added support for timeout on handlers