Not sure speaking about the timeout issue is relevant here, since it's mentioned as a new feature later and not relevant to the "own source" thingy