Added more options to generate report