Added support for setting timeouts FIX