Added source timeout support