Made Changes to Report Class