Encapsulated / unified timeouts and set to 30 secs instead of 5 mins.