Appended new calculations to the report and separated the analysis descriptor from the analyzer