Refactor plugin's data collection