Abstract: Modifying data collection systems responsive to changes to data providing systems. When a data collection system receives a failure message from a data providing system in response to transmitting a data collection query, the data providing system can notify a data query evaluation system. The evaluation system can create a local version of the collection system and search computer-readable storage media for a modified data collection query. The evaluation system can execute the local version to provide the modified data collection query to the providing system. If the local version receives a success message in response to providing the modified data collection query, then an execution state of the local version is provided to the collection system. If the local version receives a failure message, then the data query evaluation system iteratively performs refined searches of different computer-readable storage media until the modified data collection query is identified.