Added some parameters to data collection