Increase Timeout for Controller
Provide config for controller discovery