Add configurable timeout