Optimised the data collection feature