Adds configurable default timeout