This will simplify tracking the data fetching of the Engine and avoids the risk of crashes and race conditions. This was requested for discover for quite a while, because of ugly workarounds and crashes.