Corrected components and added monitoring&notification report