Small improvements to support data collection.
Disabled plugin that is too slow.