Add option for custom timeout/increase timeout