Some changes for new report
Add 'device' parameter and other