Adding support to define a timeout