Improve sending report functionality