adding changes to allow timeouts to be configured for all driver types.