Timeout is now configurable