Added logic for reports