Added flexibility in report types