Added ability to override timeouts if set in the options