Add configurable timeouts