Added timeout configuration