Added handling of out of scope data from plugins.